Lint fixes and model added to Workspace

Author: isivaselvan

examples/policy_set.py

@@ -4,9 +4,9 @@
 import os
 
 from pytfe import TFEClient, TFEConfig
-from pytfe.models import Policy
-from pytfe.models import PolicyKind
 from pytfe.models import (
+    Policy,
+    PolicyKind,
     PolicySetAddPoliciesOptions,
     PolicySetAddProjectsOptions,
     PolicySetAddWorkspacesOptions,
@@ -16,9 +16,9 @@
     PolicySetRemoveProjectsOptions,
     PolicySetRemoveWorkspacesOptions,
     PolicySetUpdateOptions,
+    Project,
+    Workspace,
 )
-from pytfe.models import Workspace
-from pytfe.models import Project
 
 
 def _print_header(title: str):

src/pytfe/models/__init__.py

@@ -23,53 +23,6 @@
 from .apply import (
     Apply,
 )
-from .plan import (
-    Plan,
-)
-
-# ── Policy ─────────────────────────────────────────────────────────────
-from .policy_check import (
-    PolicyCheck,
-    PolicyCheckIncludeOpt,
-    PolicyScope,
-    PolicyStatus,
-    PolicyActions,
-    PolicyPermissions,
-    PolicyResult,
-    PolicyStatusTimestamps,
-    PolicyCheckListOptions,
-    PolicyCheckList,
-)
-
-from .policy import (
-    Policy,
-    PolicyCreateOptions,
-    PolicyList,
-    PolicyListOptions,
-    PolicyUpdateOptions,
-)
-from .policy_set import (
-    PolicySet,
-    PolicySetIncludeOpt,
-    PolicySetList,
-    PolicySetAddPoliciesOptions,
-    PolicySetAddProjectsOptions,
-    PolicySetAddWorkspacesOptions,
-    PolicySetAddWorkspaceExclusionsOptions,
-    PolicySetCreateOptions,
-    PolicySetListOptions,
-    PolicySetReadOptions,
-    PolicySetRemovePoliciesOptions,
-    PolicySetRemoveWorkspacesOptions,
-    PolicySetRemoveWorkspaceExclusionsOptions,
-    PolicySetRemoveProjectsOptions,
-    PolicySetUpdateOptions,
-)
-
-from .policy_types import (
-    PolicyKind,
-    EnforcementLevel,
-)
 
 # ── Core models split out of old types.py ─────────────────────────────────────
 # Adjust these imports to match where you placed them during the split.
@@ -138,6 +91,51 @@
     ReadRunQueueOptions,
     RunQueue,
 )
+from .plan import (
+    Plan,
+)
+from .policy import (
+    Policy,
+    PolicyCreateOptions,
+    PolicyList,
+    PolicyListOptions,
+    PolicyUpdateOptions,
+)
+
+# ── Policy ─────────────────────────────────────────────────────────────
+from .policy_check import (
+    PolicyActions,
+    PolicyCheck,
+    PolicyCheckIncludeOpt,
+    PolicyCheckList,
+    PolicyCheckListOptions,
+    PolicyPermissions,
+    PolicyResult,
+    PolicyScope,
+    PolicyStatus,
+    PolicyStatusTimestamps,
+)
+from .policy_set import (
+    PolicySet,
+    PolicySetAddPoliciesOptions,
+    PolicySetAddProjectsOptions,
+    PolicySetAddWorkspaceExclusionsOptions,
+    PolicySetAddWorkspacesOptions,
+    PolicySetCreateOptions,
+    PolicySetIncludeOpt,
+    PolicySetList,
+    PolicySetListOptions,
+    PolicySetReadOptions,
+    PolicySetRemovePoliciesOptions,
+    PolicySetRemoveProjectsOptions,
+    PolicySetRemoveWorkspaceExclusionsOptions,
+    PolicySetRemoveWorkspacesOptions,
+    PolicySetUpdateOptions,
+)
+from .policy_types import (
+    EnforcementLevel,
+    PolicyKind,
+)
 from .project import Project
 
 # ── Query Runs ────────────────────────────────────────────────────────────────
@@ -210,58 +208,55 @@
 
 # Runs
 from .run import (
+    OrganizationRunList,
     Run,
-    RunStatus,
-    RunSource,
+    RunActions,
+    RunApplyOptions,
+    RunCancelOptions,
+    RunCreateOptions,
+    RunDiscardOptions,
+    RunForceCancelOptions,
     RunIncludeOpt,
+    RunList,
+    RunListForOrganizationOptions,
+    RunListOptions,
     RunOperation,
-    RunActions,
     RunPermissions,
+    RunReadOptions,
+    RunSource,
+    RunStatus,
     RunStatusTimestamps,
     RunVariable,
     RunVariableAttr,
-    RunList,
-    RunListOptions,
-    OrganizationRunList,
-    RunListForOrganizationOptions,
-    RunCreateOptions,
-    RunReadOptions,
-    RunApplyOptions,
-    RunCancelOptions,
-    RunForceCancelOptions,
-    RunDiscardOptions,
 )
-
 from .run_event import (
     RunEvent,
     RunEventIncludeOpt,
     RunEventList,
     RunEventListOptions,
     RunEventReadOptions,
 )
-
 from .run_task import (
-    RunTask,
-    RunTaskIncludeOptions,
     GlobalRunTask,
     GlobalRunTaskOptions,
-    Stage,
-    TaskEnforcementLevel,
+    RunTask,
+    RunTaskCreateOptions,
+    RunTaskIncludeOptions,
     RunTaskList,
     RunTaskListOptions,
-    RunTaskCreateOptions,
-    RunTaskUpdateOptions,
     RunTaskReadOptions,
+    RunTaskUpdateOptions,
+    Stage,
+    TaskEnforcementLevel,
 )
-
 from .run_trigger import (
     RunTrigger,
     RunTriggerCreateOptions,
+    RunTriggerFilterOp,
+    RunTriggerIncludeOp,
     RunTriggerList,
     RunTriggerListOptions,
     SourceableChoice,
-    RunTriggerFilterOp,
-    RunTriggerIncludeOp,
 )
 
 # ── SSH Keys ──────────────────────────────────────────────────────────────────
@@ -285,6 +280,7 @@
 from .workspace import (
     LockedByChoice,
     VCSRepo,
+    VCSRepoOptions,
     Workspace,
     WorkspaceActions,
     WorkspaceAddRemoteStateConsumersOptions,
@@ -443,6 +439,7 @@
     "VariableUpdateOptions",
     "LockedByChoice",
     "VCSRepo",
+    "VCSRepoOptions",
     "Workspace",
     "WorkspaceActions",
     "WorkspaceAddRemoteStateConsumersOptions",

src/pytfe/models/policy_set.py

@@ -5,11 +5,11 @@
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from .project import Project
 from .organization import Organization
 from .policy import Policy
 from .policy_set_version import PolicySetVersion
 from .policy_types import PolicyKind
+from .project import Project
 from .workspace import VCSRepo, VCSRepoOptions, Workspace
 
 

src/pytfe/models/workspace.py

@@ -338,3 +338,12 @@ class VCSRepo(BaseModel):
     oauth_token_id: str | None = None
     tags_regex: str | None = None
     gha_installation_id: str | None = None
+
+
+class VCSRepoOptions(BaseModel):
+    branch: str | None = None
+    identifier: str | None = None
+    ingress_submodules: bool | None = None
+    oauth_token_id: str | None = None
+    tags_regex: str | None = None
+    gha_installation_id: str | None = None