refactor: refactor code structure and remove redundant sections for improved readability and maintainability

guptadev21 · guptadev21 · commit 82470ed37187 · 2025-09-29T16:13:04.000+05:30
diff --git a/rapyuta_io_sdk_v2/__init__.py b/rapyuta_io_sdk_v2/__init__.py
@@ -4,4 +4,33 @@
 from rapyuta_io_sdk_v2.config import Configuration
 from rapyuta_io_sdk_v2.utils import walk_pages
 
+# Import all models directly into the main namespace
+from .models import (
+    # Core models
+    Secret,
+    StaticRoute,
+    Disk,
+    Deployment,
+    Package,
+    Project,
+    Network,
+    User,
+    Organization,
+    # List models
+    ProjectList,
+    DeploymentList,
+    DiskList,
+    NetworkList,
+    PackageList,
+    SecretList,
+    StaticRouteList,
+    # Managed service models
+    ManagedServiceProvider,
+    ManagedServiceBinding,
+    ManagedServiceBindingList,
+    ManagedServiceInstance,
+    ManagedServiceInstanceList,
+    ManagedServiceProviderList,
+)
+
 __version__ = "0.3.0"
diff --git a/rapyuta_io_sdk_v2/async_client.py b/rapyuta_io_sdk_v2/async_client.py
@@ -18,7 +18,7 @@
 import httpx
 
 from rapyuta_io_sdk_v2.config import Configuration
-from rapyuta_io_sdk_v2.pydantic_models import (
+from rapyuta_io_sdk_v2.models import (
     Secret,
     StaticRoute,
     Disk,
diff --git a/rapyuta_io_sdk_v2/client.py b/rapyuta_io_sdk_v2/client.py
@@ -18,7 +18,7 @@
 import httpx
 
 from rapyuta_io_sdk_v2.config import Configuration
-from rapyuta_io_sdk_v2.pydantic_models import (
+from rapyuta_io_sdk_v2.models import (
     Secret,
     StaticRoute,
     Disk,
@@ -206,7 +206,7 @@ def update_organization(
         Returns:
             Organization: Organization details as an Organization object.
         """
-        from rapyuta_io_sdk_v2.pydantic_models.organization import Organization
+        from rapyuta_io_sdk_v2.models.organization import Organization
 
         validated_body = Organization.model_validate(obj=body)
         result = self.c.put(
diff --git a/rapyuta_io_sdk_v2/models/__init__.py b/rapyuta_io_sdk_v2/models/__init__.py
diff --git a/rapyuta_io_sdk_v2/models/deployment.py b/rapyuta_io_sdk_v2/models/deployment.py
@@ -9,7 +9,7 @@
 from typing import Literal
 from pydantic import BaseModel, Field, model_validator
 
-from rapyuta_io_sdk_v2.pydantic_models.utils import (
+from rapyuta_io_sdk_v2.models.utils import (
     BaseMetadata,
     BaseList,
     Depends,
diff --git a/rapyuta_io_sdk_v2/models/disk.py b/rapyuta_io_sdk_v2/models/disk.py
@@ -9,7 +9,7 @@
 from typing import Literal
 from pydantic import BaseModel, Field, field_validator
 
-from rapyuta_io_sdk_v2.pydantic_models.utils import BaseMetadata, BaseList, Runtime
+from rapyuta_io_sdk_v2.models.utils import BaseMetadata, BaseList, Runtime
 
 
 class DiskBound(BaseModel):
@@ -51,6 +51,14 @@ class DiskStatus(BaseModel):
         default=None, description="Disk bound information"
     )
 
+    @field_validator("diskBound", mode="before")
+    @classmethod
+    def normalize_disk_bound(cls, v):
+        """Convert empty dict to None for diskBound field."""
+        if isinstance(v, dict) and not v:
+            return None
+        return v
+
 
 class Disk(BaseModel):
     """Disk model."""
diff --git a/rapyuta_io_sdk_v2/models/managedservice.py b/rapyuta_io_sdk_v2/models/managedservice.py
@@ -3,7 +3,7 @@
 from typing import Any, Literal
 from pydantic import BaseModel, Field
 
-from rapyuta_io_sdk_v2.pydantic_models.utils import BaseMetadata, BaseList, ListMeta
+from rapyuta_io_sdk_v2.models.utils import BaseMetadata, BaseList, ListMeta
 
 
 ManagedServiceStatus = Literal["Pending", "Error", "Success", "Deleting", "Unknown"]
diff --git a/rapyuta_io_sdk_v2/models/network.py b/rapyuta_io_sdk_v2/models/network.py
@@ -9,7 +9,7 @@
 from typing import Literal
 from pydantic import AliasChoices, BaseModel, Field, field_validator
 
-from rapyuta_io_sdk_v2.pydantic_models.utils import (
+from rapyuta_io_sdk_v2.models.utils import (
     Architecture,
     BaseMetadata,
     BaseList,
diff --git a/rapyuta_io_sdk_v2/models/organization.py b/rapyuta_io_sdk_v2/models/organization.py
diff --git a/rapyuta_io_sdk_v2/models/package.py b/rapyuta_io_sdk_v2/models/package.py
@@ -9,7 +9,7 @@
 from typing import Literal
 from pydantic import BaseModel, Field, RootModel, field_validator, model_validator
 
-from rapyuta_io_sdk_v2.pydantic_models.utils import (
+from rapyuta_io_sdk_v2.models.utils import (
     Architecture,
     BaseMetadata,
     BaseList,
@@ -147,7 +147,7 @@ def check_spec_device_or_cloud(obj):
 
 class PackageMetadata(BaseMetadata):
     version: str | None
-    description: str | None
+    description: str | None = Field(default=None)
 
 
 class Package(BaseModel):
diff --git a/rapyuta_io_sdk_v2/models/project.py b/rapyuta_io_sdk_v2/models/project.py
@@ -9,7 +9,7 @@
 from typing import Literal
 from pydantic import BaseModel, Field
 
-from rapyuta_io_sdk_v2.pydantic_models.utils import BaseMetadata, BaseList
+from rapyuta_io_sdk_v2.models.utils import BaseMetadata, BaseList
 
 
 class RoleSpec(str):
diff --git a/rapyuta_io_sdk_v2/models/secret.py b/rapyuta_io_sdk_v2/models/secret.py
@@ -8,7 +8,7 @@
 
 from pydantic import BaseModel, Field, field_validator
 
-from rapyuta_io_sdk_v2.pydantic_models.utils import BaseMetadata, BaseList
+from rapyuta_io_sdk_v2.models.utils import BaseMetadata, BaseList
 
 
 class DockerSpec(BaseModel):
diff --git a/rapyuta_io_sdk_v2/models/staticroute.py b/rapyuta_io_sdk_v2/models/staticroute.py
diff --git a/rapyuta_io_sdk_v2/models/user.py b/rapyuta_io_sdk_v2/models/user.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from pydantic import BaseModel, Field
-from rapyuta_io_sdk_v2.pydantic_models.utils import BaseMetadata, BaseList
+from rapyuta_io_sdk_v2.models.utils import BaseMetadata, BaseList
 
 
 class UserOrganization(BaseModel):
diff --git a/rapyuta_io_sdk_v2/models/utils.py b/rapyuta_io_sdk_v2/models/utils.py
diff --git a/tests/async_tests/test_deployment_async.py b/tests/async_tests/test_deployment_async.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import DeploymentList, Deployment
+from rapyuta_io_sdk_v2.models import DeploymentList, Deployment
 from tests.utils.fixtures import async_client
 from tests.data import (
     deployment_body,
diff --git a/tests/async_tests/test_disk_async.py b/tests/async_tests/test_disk_async.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import DiskList, Disk
+from rapyuta_io_sdk_v2.models import DiskList, Disk
 from tests.utils.fixtures import async_client
 from tests.data import (
     disk_body,
diff --git a/tests/async_tests/test_managedservice_async.py b/tests/async_tests/test_managedservice_async.py
@@ -3,7 +3,7 @@
 from asyncmock import AsyncMock
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import (
+from rapyuta_io_sdk_v2.models import (
     ManagedServiceBinding,
     ManagedServiceInstanceList,
     ManagedServiceBindingList,
diff --git a/tests/async_tests/test_network_async.py b/tests/async_tests/test_network_async.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import NetworkList, Network
+from rapyuta_io_sdk_v2.models import NetworkList, Network
 from tests.utils.fixtures import async_client
 from tests.data import (
     network_body,
diff --git a/tests/async_tests/test_organization_async.py b/tests/async_tests/test_organization_async.py
@@ -3,7 +3,7 @@
 import pytest
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models.organization import Organization
+from rapyuta_io_sdk_v2.models.organization import Organization
 from tests.data.mock_data import mock_response_organization, organization_body
 from tests.utils.fixtures import async_client as client
 
diff --git a/tests/async_tests/test_package_async.py b/tests/async_tests/test_package_async.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import PackageList, Package
+from rapyuta_io_sdk_v2.models import PackageList, Package
 from tests.utils.fixtures import async_client
 from tests.data import (
     package_body,
diff --git a/tests/async_tests/test_project_async.py b/tests/async_tests/test_project_async.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import ProjectList, Project
+from rapyuta_io_sdk_v2.models import ProjectList, Project
 from tests.utils.fixtures import async_client
 from tests.data import (
     project_body,
diff --git a/tests/async_tests/test_secret_async.py b/tests/async_tests/test_secret_async.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import SecretList, Secret
+from rapyuta_io_sdk_v2.models import SecretList, Secret
 from tests.utils.fixtures import async_client
 from tests.data import (
     secret_body,
diff --git a/tests/async_tests/test_staticroute_async.py b/tests/async_tests/test_staticroute_async.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import StaticRouteList, StaticRoute
+from rapyuta_io_sdk_v2.models import StaticRouteList, StaticRoute
 from tests.utils.fixtures import async_client
 from tests.data import (
     staticroute_body,
diff --git a/tests/sync_tests/test_deployment.py b/tests/sync_tests/test_deployment.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import DeploymentList, Deployment
+from rapyuta_io_sdk_v2.models import DeploymentList, Deployment
 from tests.utils.fixtures import client
 from tests.data import (
     deployment_body,
diff --git a/tests/sync_tests/test_disk.py b/tests/sync_tests/test_disk.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import Disk, DiskList
+from rapyuta_io_sdk_v2.models import Disk, DiskList
 from tests.data.mock_data import disk_body, disk_model_mock, disklist_model_mock
 from tests.utils.fixtures import client
 
diff --git a/tests/sync_tests/test_managedservice.py b/tests/sync_tests/test_managedservice.py
@@ -2,7 +2,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import (
+from rapyuta_io_sdk_v2.models import (
     ManagedServiceBinding,
     ManagedServiceInstanceList,
     ManagedServiceBindingList,
diff --git a/tests/sync_tests/test_network.py b/tests/sync_tests/test_network.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import Network, NetworkList
+from rapyuta_io_sdk_v2.models import Network, NetworkList
 from tests.data.mock_data import network_body, network_model_mock, networklist_model_mock
 from tests.utils.fixtures import client
 
diff --git a/tests/sync_tests/test_organization.py b/tests/sync_tests/test_organization.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models.organization import Organization
+from rapyuta_io_sdk_v2.models.organization import Organization
 from tests.data.mock_data import mock_response_organization, organization_body
 from tests.utils.fixtures import client
 
diff --git a/tests/sync_tests/test_package.py b/tests/sync_tests/test_package.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import Package, PackageList
+from rapyuta_io_sdk_v2.models import Package, PackageList
 from tests.utils.fixtures import client
 from tests.data import (
     package_body,
diff --git a/tests/sync_tests/test_project.py b/tests/sync_tests/test_project.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import Project, ProjectList
+from rapyuta_io_sdk_v2.models import Project, ProjectList
 from tests.data import project_body, project_model_mock, projectlist_model_mock
 from tests.utils.fixtures import client
 
diff --git a/tests/sync_tests/test_secret.py b/tests/sync_tests/test_secret.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import Secret, SecretList
+from rapyuta_io_sdk_v2.models import Secret, SecretList
 from tests.data.mock_data import secret_body, secret_model_mock, secretlist_model_mock
 from tests.utils.fixtures import client
 
diff --git a/tests/sync_tests/test_staticroute.py b/tests/sync_tests/test_staticroute.py
@@ -3,7 +3,7 @@
 from pytest_mock import MockFixture
 
 # ruff: noqa: F811, F401
-from rapyuta_io_sdk_v2.pydantic_models import StaticRoute, StaticRouteList
+from rapyuta_io_sdk_v2.models import StaticRoute, StaticRouteList
 from tests.utils.fixtures import client
 from tests.data.mock_data import (
     staticroutelist_model_mock as staticroutelist_model_mock,
diff --git a/uv.lock b/uv.lock
