MPT-12330 Moved modules to resources

albertsola · albertsola · commit eb11da41c079 · 2025-08-20T11:55:30.000+01:00
diff --git a/mpt_api_client/__init__.py b/mpt_api_client/__init__.py
@@ -0,0 +1,4 @@
+from mpt_api_client.mptclient import MPTClient
+from mpt_api_client.rql import RQLQuery
+
+__all__ = ["MPTClient", "RQLQuery"]  # noqa: WPS410
diff --git a/mpt_api_client/http/client.py b/mpt_api_client/http/client.py
@@ -3,7 +3,7 @@
 import httpx
 
 
-class MPTClient(httpx.Client):
+class HTTPClient(httpx.Client):
     """A client for interacting with SoftwareOne Marketplace Platform API."""
 
     def __init__(
diff --git a/mpt_api_client/http/collection.py b/mpt_api_client/http/collection.py
@@ -5,7 +5,7 @@
 
 import httpx
 
-from mpt_api_client.http.client import MPTClient
+from mpt_api_client.http.client import HTTPClient
 from mpt_api_client.http.resource import ResourceBaseClient
 from mpt_api_client.models import Collection, Resource
 from mpt_api_client.rql.query_builder import RQLQuery
@@ -33,9 +33,9 @@ class CollectionBaseClient[ResourceModel: Resource, ResourceClient: ResourceBase
     def __init__(
         self,
         query_rql: RQLQuery | None = None,
-        client: MPTClient | None = None,
+        client: HTTPClient | None = None,
     ) -> None:
-        self.mpt_client = client or MPTClient()
+        self.mpt_client = client or HTTPClient()
         self.query_rql: RQLQuery | None = query_rql
         self.query_order_by: list[str] | None = None
         self.query_select: list[str] | None = None
@@ -158,18 +158,23 @@ def fetch_one(self) -> ResourceModel:
 
         return resource_list[0]
 
-    def iterate(self) -> Iterator[ResourceModel]:
+    def iterate(self, batch_size: int = 100) -> Iterator[ResourceModel]:
         """Iterate over all resources, yielding GenericResource objects.
 
+        Args:
+            batch_size: Number of resources to fetch per request
+
         Returns:
             Iterator of resources.
         """
         offset = 0
-        limit = 100  # Default page size
+        limit = batch_size  # Default page size
 
         while True:
             response = self._fetch_page_as_response(limit=limit, offset=offset)
-            items_collection: Collection[ResourceModel] = Collection.from_response(response)
+            items_collection: Collection[ResourceModel] = self._collection_class.from_response(
+                response
+            )
             yield from items_collection
 
             if not items_collection.meta:
diff --git a/mpt_api_client/http/resource.py b/mpt_api_client/http/resource.py
@@ -3,7 +3,7 @@
 
 from httpx import Response
 
-from mpt_api_client.http.client import MPTClient
+from mpt_api_client.http.client import HTTPClient
 from mpt_api_client.models import Resource
 
 
@@ -14,7 +14,7 @@ class ResourceBaseClient[ResourceType: Resource](ABC):  # noqa: WPS214
     _resource_class: type[ResourceType]
     _safe_attributes: ClassVar[set[str]] = {"mpt_client_", "resource_id_", "resource_"}
 
-    def __init__(self, client: MPTClient, resource_id: str) -> None:
+    def __init__(self, client: HTTPClient, resource_id: str) -> None:
         self.mpt_client_ = client  # noqa: WPS120
         self.resource_id_ = resource_id  # noqa: WPS120
         self.resource_: Resource | None = None  # noqa: WPS120
diff --git a/mpt_api_client/modules/__init__.py b/mpt_api_client/modules/__init__.py
diff --git a/mpt_api_client/mptclient.py b/mpt_api_client/mptclient.py
@@ -1,19 +1,19 @@
-from mpt_api_client.http.client import MPTClient
-from mpt_api_client.modules import OrderCollectionClient
+from mpt_api_client.http.client import HTTPClient
 from mpt_api_client.registry import Registry, commerce
+from mpt_api_client.resources import OrderCollectionClient
 
 
-class MPT:
+class MPTClient:
     """MPT API Client."""
 
     def __init__(
         self,
         base_url: str | None = None,
         api_key: str | None = None,
         registry: Registry | None = None,
-        mpt_client: MPTClient | None = None,
+        mpt_client: HTTPClient | None = None,
     ):
-        self.mpt_client = mpt_client or MPTClient(base_url=base_url, api_token=api_key)
+        self.mpt_client = mpt_client or HTTPClient(base_url=base_url, api_token=api_key)
         self.registry: Registry = registry or Registry()
 
     def __getattr__(self, name):  # type: ignore[no-untyped-def]
@@ -30,7 +30,7 @@ def commerce(self) -> "CommerceMpt":
         return CommerceMpt(mpt_client=self.mpt_client, registry=commerce)
 
 
-class CommerceMpt(MPT):
+class CommerceMpt(MPTClient):
     """Commerce MPT API Client."""
 
     @property
diff --git a/mpt_api_client/resources/__init__.py b/mpt_api_client/resources/__init__.py
@@ -0,0 +1,3 @@
+from mpt_api_client.resources.order import Order, OrderCollectionClient, OrderResourceClient
+
+__all__ = ["Order", "OrderCollectionClient", "OrderResourceClient"]  # noqa: WPS410
diff --git a/mpt_api_client/resources/order.py b/mpt_api_client/resources/order.py
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from mpt_api_client.http.client import MPTClient
+from mpt_api_client.http.client import HTTPClient
 from mpt_api_client.models import Resource
 
 API_TOKEN = "test-token"
@@ -15,4 +15,4 @@ class DummyResource(Resource):
 
 @pytest.fixture
 def mpt_client():
-    return MPTClient(base_url=API_URL, api_token=API_TOKEN)
+    return HTTPClient(base_url=API_URL, api_token=API_TOKEN)
diff --git a/tests/http/collection/test_collection_client_init.py b/tests/http/collection/test_collection_client_init.py
@@ -1,13 +1,13 @@
 import pytest
 
-from mpt_api_client.http.client import MPTClient
+from mpt_api_client.http.client import HTTPClient
 from mpt_api_client.rql.query_builder import RQLQuery
 from tests.http.conftest import DummyCollectionClient
 
 
 @pytest.fixture
 def mock_mpt_client(api_url, api_token):
-    return MPTClient(base_url=api_url, api_token=api_token)
+    return HTTPClient(base_url=api_url, api_token=api_token)
 
 
 @pytest.fixture
diff --git a/tests/http/conftest.py b/tests/http/conftest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from mpt_api_client.http.client import MPTClient
+from mpt_api_client.http.client import HTTPClient
 from mpt_api_client.http.collection import CollectionBaseClient
 from mpt_api_client.http.resource import ResourceBaseClient
 from mpt_api_client.models import Collection
@@ -31,7 +31,7 @@ def api_token():
 
 @pytest.fixture
 def mpt_client(api_url, api_token):
-    return MPTClient(base_url=api_url, api_token=api_token)
+    return HTTPClient(base_url=api_url, api_token=api_token)
 
 
 @pytest.fixture
diff --git a/tests/http/test_client.py b/tests/http/test_client.py
@@ -2,12 +2,12 @@
 import respx
 from httpx import ConnectTimeout, Response, codes
 
-from mpt_api_client.http.client import MPTClient
+from mpt_api_client.http.client import HTTPClient
 from tests.conftest import API_TOKEN, API_URL
 
 
 def test_mpt_client_initialization():
-    client = MPTClient(base_url=API_URL, api_token=API_TOKEN)
+    client = HTTPClient(base_url=API_URL, api_token=API_TOKEN)
 
     assert client.base_url == API_URL
     assert client.headers["Authorization"] == "Bearer test-token"
@@ -18,20 +18,20 @@ def test_env_initialization(monkeypatch):
     monkeypatch.setenv("MPT_TOKEN", API_TOKEN)
     monkeypatch.setenv("MPT_URL", API_URL)
 
-    client = MPTClient()
+    client = HTTPClient()
 
     assert client.base_url == API_URL
     assert client.headers["Authorization"] == f"Bearer {API_TOKEN}"
 
 
 def test_mpt_client_without_token():
     with pytest.raises(ValueError):
-        MPTClient(base_url=API_URL)
+        HTTPClient(base_url=API_URL)
 
 
 def test_mpt_client_without_url():
     with pytest.raises(ValueError):
-        MPTClient(api_token=API_TOKEN)
+        HTTPClient(api_token=API_TOKEN)
 
 
 @respx.mock
diff --git a/tests/resources/orders/test_order_collection_client.py b/tests/resources/orders/test_order_collection_client.py
@@ -1,4 +1,4 @@
-from mpt_api_client.modules.order import OrderCollectionClient
+from mpt_api_client.resources.order import OrderCollectionClient
 
 
 def test_order_collection_client(mpt_client):
diff --git a/tests/resources/orders/test_order_resource_client.py b/tests/resources/orders/test_order_resource_client.py
@@ -3,7 +3,7 @@
 import httpx
 import pytest
 
-from mpt_api_client.modules.order import Order, OrderResourceClient
+from mpt_api_client.resources.order import Order, OrderResourceClient
 
 
 @pytest.fixture
diff --git a/tests/test_mpt.py b/tests/test_mpt.py
@@ -1,12 +1,12 @@
 from unittest.mock import Mock
 
-from mpt_api_client.modules import OrderCollectionClient
-from mpt_api_client.mpt import MPT
+from mpt_api_client.mptclient import MPTClient
+from mpt_api_client.resources import OrderCollectionClient
 
 
 def test_mapped_module() -> None:
     mock_registry = Mock()
-    mpt = MPT(base_url="https://test.example.com", api_key="test-key", registry=mock_registry)
+    mpt = MPTClient(base_url="https://test.example.com", api_key="test-key", registry=mock_registry)
 
     mpt.orders  # noqa: B018
 
@@ -15,15 +15,15 @@ def test_mapped_module() -> None:
 
 def test_not_mapped_module() -> None:
     mock_registry = Mock()
-    mpt = MPT(base_url="https://test.example.com", api_key="test-key", registry=mock_registry)
+    mpt = MPTClient(base_url="https://test.example.com", api_key="test-key", registry=mock_registry)
 
     mpt.non_existing_module  # noqa: B018
 
     mock_registry.get.assert_called_once_with("non_existing_module")
 
 
 def test_subclient_orders_module():
-    mpt = MPT(base_url="https://test.example.com", api_key="test-key")
+    mpt = MPTClient(base_url="https://test.example.com", api_key="test-key")
 
     orders_client = mpt.commerce.orders
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from mpt_api_client.resources.order import Order, OrderCollectionClient, OrderResourceClient`
	`2`	`+`
	`3`	`+__all__ = ["Order", "OrderCollectionClient", "OrderResourceClient"] # noqa: WPS410`