Skip to content

Commit 2da9da1

Browse files
committed
Updated models to handle circular import issues
1 parent 4597aa5 commit 2da9da1

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/pytfe/models/project.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
from __future__ import annotations
55

6+
from typing import TYPE_CHECKING
7+
68
from pydantic import BaseModel, ConfigDict, Field
79

8-
from .agent import AgentPool
910
from .common import TagBinding
1011
from .organization import Organization
1112

13+
if TYPE_CHECKING:
14+
from .agent import AgentPool
15+
1216

1317
class Project(BaseModel):
1418
model_config = ConfigDict(populate_by_name=True, validate_by_name=True)

src/pytfe/models/workspace.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
UnsupportedOperationsError,
2222
)
2323
from ..utils import has_tags_regex_defined, is_valid_workspace_name, valid_string
24-
from .agent import AgentPool
2524
from .common import EffectiveTagBinding, Tag, TagBinding
2625
from .configuration_version import ConfigurationVersion
2726
from .data_retention_policy import DataRetentionPolicyChoice
@@ -32,6 +31,7 @@
3231
from .variable import Variable
3332

3433
if TYPE_CHECKING:
34+
from .agent import AgentPool
3535
from .run import Run
3636

3737

@@ -525,6 +525,7 @@ class VCSRepoOptions(BaseModel):
525525
def _rebuild_workspace_model() -> None:
526526
"""Rebuild Workspace model to resolve forward references."""
527527
try:
528+
from .agent import AgentPool # noqa: F401
528529
from .run import Run # noqa: F401
529530
from .task_stage import TaskStage # noqa: F401
530531

src/pytfe/models/workspace_run_task.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ class WorkspaceRunTaskUpdateOptions(BaseModel):
6868

6969
# WorkspaceRunTask is now fully defined; rebuild RunTask so Pydantic can
7070
# resolve the forward reference in RunTask.workspace_run_tasks.
71-
RunTask.model_rebuild()
71+
RunTask.model_rebuild(raise_errors=False)

0 commit comments

Comments
 (0)