apexdevkit 1.15.7__tar.gz → 1.16.2__tar.gz

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apexdevkit
-Version: 1.15.7
+Version: 1.16.2
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/apexdevkit/fastapi/dependable.py

@@ -6,9 +6,9 @@ from fastapi.requests import Request
 
 from apexdevkit.error import ApiError, DoesNotExistError
 from apexdevkit.fastapi import RestfulServiceBuilder
+from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.service import RestfulService
-from apexdevkit.testing import RestfulName
 
 
 def inject(dependency: str) -> Any:  # pragma: no cover

apexdevkit-1.16.2/apexdevkit/fastapi/name.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from apexdevkit.http import HttpUrl
+
+
+@dataclass
+class RestfulName:
+    singular: str
+
+    plural: str = ""
+
+    def __post_init__(self) -> None:
+        self.plural = self.plural or as_plural(self.singular)
+
+    def __add__(self, other: str) -> str:
+        return HttpUrl(self.plural) + other
+
+
+def as_plural(singular: str) -> str:
+    suffixes = {
+        "y": "ies",
+        "ch": "ches",
+        "sh": "shes",
+        "s": "ses",
+        "z": "zes",
+        "x": "xes",
+        "fe": "ves",
+        "f": "ves",
+    }
+
+    for singular_suffix, plural_suffix in suffixes.items():
+        if singular.endswith(singular_suffix):
+            return singular.removesuffix(singular_suffix) + plural_suffix
+
+    return singular + "s"

apexdevkit-1.16.2/apexdevkit/fastapi/request.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+from apexdevkit.http import Http, HttpMethod, JsonDict
+from apexdevkit.http.fluent import HttpResponse
+
+
+@dataclass
+class HttpRequest:
+    method: HttpMethod
+    http: Http
+
+    def with_endpoint(self, value: Any) -> HttpRequest:
+        self.http = self.http.with_endpoint(str(value))
+
+        return self
+
+    def with_param(self, name: str, value: Any) -> HttpRequest:
+        self.http = self.http.with_param(name, value)
+
+        return self
+
+    def with_json(self, value: JsonDict) -> HttpRequest:
+        self.http = self.http.with_json(value)
+
+        return self
+
+    def __call__(self) -> HttpResponse:
+        return self.http.request(self.method)

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/apexdevkit/fastapi/response.py

@@ -1,10 +1,8 @@
-from __future__ import annotations
-
 from dataclasses import dataclass
 from typing import Any, Iterable
 
 from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
-from apexdevkit.testing import RestfulName
+from apexdevkit.fastapi.name import RestfulName
 
 
 @dataclass(frozen=True)

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/apexdevkit/fastapi/router.py

@@ -6,11 +6,11 @@ from fastapi import APIRouter, Depends, Path
 from fastapi.responses import JSONResponse
 
 from apexdevkit.fastapi.builder import RestfulServiceBuilder
+from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fastapi.resource import RestfulResource
 from apexdevkit.fastapi.response import RestfulResponse
 from apexdevkit.fastapi.schema import RestfulSchema, SchemaFields
 from apexdevkit.fastapi.service import RawCollection, RawItem, RestfulService
-from apexdevkit.testing import RestfulName
 
 _Response = JSONResponse | dict[str, Any]
 

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/apexdevkit/fastapi/schema.py

@@ -5,8 +5,8 @@ from typing import Any, Callable, Iterable, List
 
 from pydantic import BaseModel, create_model
 
+from apexdevkit.fastapi.name import RestfulName
 from apexdevkit.fluent import FluentDict
-from apexdevkit.testing import RestfulName
 
 
 class SchemaFields(ABC):

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/apexdevkit/fluent.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Callable, Generic, TypeVar
+from typing import Any, Callable, Generic, TypeVar
 
 ItemT = TypeVar("ItemT")
 
@@ -33,6 +33,9 @@ class FluentElement(Generic[ItemT]):
     def to(self, a_type: Callable[[ItemT], ConvertedT]) -> ConvertedT:
         return a_type(self.value)
 
+    def as_dict(self) -> dict[str, Any]:
+        return dict(self.value)  # type: ignore
+
     def __str__(self) -> str:
         return str(self.value)
 

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/apexdevkit/testing/__init__.py

@@ -1,11 +1,9 @@
 from apexdevkit.testing.database import FakeConnector
 from apexdevkit.testing.fake import FakeValue
-from apexdevkit.testing.rest import RestCollection, RestfulName, RestResource
+from apexdevkit.testing.rest import RestCollection
 
 __all__ = [
     "FakeConnector",
     "RestCollection",
-    "RestfulName",
-    "RestResource",
     "FakeValue",
 ]

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/apexdevkit/testing/rest.py

@@ -4,17 +4,19 @@ from dataclasses import dataclass
 from functools import cached_property
 from typing import Any, Iterable, Self
 
-from apexdevkit.http import Http, HttpUrl, JsonDict
-from apexdevkit.http.fluent import HttpMethod, HttpResponse
+from apexdevkit.fastapi.name import RestfulName
+from apexdevkit.fastapi.request import HttpRequest
+from apexdevkit.http import Http, HttpMethod, JsonDict
+from apexdevkit.http.fluent import HttpResponse
 
 
 @dataclass(frozen=True)
-class RestResource:
+class _RestResource:
     http: Http
     name: RestfulName
 
-    def create_one(self) -> RestRequest:
-        return RestRequest(
+    def create_one(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.post,
@@ -22,8 +24,8 @@ class RestResource:
             ),
         )
 
-    def create_many(self) -> RestRequest:
-        return RestRequest(
+    def create_many(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.post,
@@ -31,8 +33,8 @@ class RestResource:
             ),
         )
 
-    def read_one(self) -> RestRequest:
-        return RestRequest(
+    def read_one(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.get,
@@ -40,8 +42,8 @@ class RestResource:
             ),
         )
 
-    def read_all(self) -> RestRequest:
-        return RestRequest(
+    def read_all(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.get,
@@ -49,8 +51,8 @@ class RestResource:
             ),
         )
 
-    def update_one(self) -> RestRequest:
-        return RestRequest(
+    def update_one(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.patch,
@@ -58,8 +60,8 @@ class RestResource:
             ),
         )
 
-    def update_many(self) -> RestRequest:
-        return RestRequest(
+    def update_many(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.patch,
@@ -67,8 +69,8 @@ class RestResource:
             ),
         )
 
-    def replace_one(self) -> RestRequest:
-        return RestRequest(
+    def replace_one(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.put,
@@ -76,8 +78,8 @@ class RestResource:
             ),
         )
 
-    def replace_many(self) -> RestRequest:
-        return RestRequest(
+    def replace_many(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.put,
@@ -85,8 +87,8 @@ class RestResource:
             ),
         )
 
-    def delete_one(self) -> RestRequest:
-        return RestRequest(
+    def delete_one(self) -> _TestRequest:
+        return _TestRequest(
             self.name,
             HttpRequest(
                 HttpMethod.delete,
@@ -95,76 +97,8 @@ class RestResource:
         )
 
 
-@dataclass(frozen=True)
-class RestCollection(RestResource):
-    def sub_resource(self, name: str) -> RestItem:
-        return RestItem(self.http.with_endpoint(self.name.plural), RestfulName(name))
-
-
-@dataclass(frozen=True)
-class RestItem(RestResource):
-    def sub_resource(self, name: str) -> RestItem:
-        return RestItem(self.http.with_endpoint(self.name.singular), RestfulName(name))
-
-
-@dataclass
-class RestfulName:
-    singular: str
-
-    plural: str = ""
-
-    def __post_init__(self) -> None:
-        self.plural = self.plural or as_plural(self.singular)
-
-    def __add__(self, other: str) -> str:
-        return HttpUrl(self.plural) + other
-
-
-def as_plural(singular: str) -> str:
-    suffixes = {
-        "y": "ies",
-        "ch": "ches",
-        "sh": "shes",
-        "s": "ses",
-        "z": "zes",
-        "x": "xes",
-        "fe": "ves",
-        "f": "ves",
-    }
-
-    for singular_suffix, plural_suffix in suffixes.items():
-        if singular.endswith(singular_suffix):
-            return singular.removesuffix(singular_suffix) + plural_suffix
-
-    return singular + "s"
-
-
-@dataclass
-class HttpRequest:
-    method: HttpMethod
-    http: Http
-
-    def with_endpoint(self, value: Any) -> HttpRequest:
-        self.http = self.http.with_endpoint(str(value))
-
-        return self
-
-    def with_param(self, name: str, value: Any) -> HttpRequest:
-        self.http = self.http.with_param(name, value)
-
-        return self
-
-    def with_json(self, value: JsonDict) -> HttpRequest:
-        self.http = self.http.with_json(value)
-
-        return self
-
-    def __call__(self) -> HttpResponse:
-        return self.http.request(self.method)
-
-
 @dataclass
-class RestRequest:
+class _TestRequest:
     resource: RestfulName
     request: HttpRequest
 
@@ -209,8 +143,8 @@ class RestRequest:
 
         return [JsonDict(item) for item in items]
 
-    def ensure(self) -> RestResponse:
-        return RestResponse(
+    def ensure(self) -> _Response:
+        return _Response(
             resource=self.resource,
             json=JsonDict(self.response.json()),
             http_code=self.response.code(),
@@ -218,7 +152,7 @@ class RestRequest:
 
 
 @dataclass
-class RestResponse:
+class _Response:
     resource: RestfulName
     json: JsonDict
     http_code: int
@@ -252,7 +186,7 @@ class RestResponse:
         return self.with_message(value)
 
     def with_message(self, value: str) -> Self:
-        assert self.json.value_of("error").to(dict) == {"message": value}, self.json
+        assert self.json.value_of("error").as_dict() == {"message": value}, self.json
 
         return self
 
@@ -275,6 +209,18 @@ class RestResponse:
         return self.with_data()
 
     def with_data(self, **kwargs: Any) -> Self:
-        assert self.json.value_of("data").to(dict) == {**kwargs}, self.json
+        assert self.json.value_of("data").as_dict() == {**kwargs}, self.json
 
         return self
+
+
+@dataclass(frozen=True)
+class RestCollection(_RestResource):
+    def sub_resource(self, name: str) -> RestItem:
+        return RestItem(self.http.with_endpoint(self.name.plural), RestfulName(name))
+
+
+@dataclass(frozen=True)
+class RestItem(_RestResource):
+    def sub_resource(self, name: str) -> RestItem:
+        return RestItem(self.http.with_endpoint(self.name.singular), RestfulName(name))

{apexdevkit-1.15.7 → apexdevkit-1.16.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.15.7"
+version = "1.16.2"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"