apexdevkit 1.15.7__tar.gz → 1.16.1__tar.gz

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

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

{apexdevkit-1.15.7 → apexdevkit-1.16.1}/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.1/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.1/apexdevkit/fastapi/request.py

@@ -0,0 +1,88 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from functools import cached_property
+from typing import Any, Iterable, Self
+
+from apexdevkit.fastapi.name import RestfulName
+from apexdevkit.fastapi.response import RestResponse
+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)
+
+
+@dataclass
+class RestRequest:
+    resource: RestfulName
+    request: HttpRequest
+
+    def with_id(self, value: Any) -> Self:
+        self.request = self.request.with_endpoint(value)
+
+        return self
+
+    def from_collection(self, value: list[JsonDict]) -> Self:
+        return self.with_data(
+            JsonDict({self.resource.plural: [dict(item) for item in value]})
+        )
+
+    def and_data(self, value: JsonDict) -> Self:
+        return self.with_data(value)
+
+    def from_data(self, value: JsonDict) -> Self:
+        return self.with_data(value)
+
+    def with_data(self, value: JsonDict) -> Self:
+        self.request = self.request.with_json(value)
+
+        return self
+
+    def and_param(self, name: str, value: Any) -> Self:
+        return self.with_param(name, value)
+
+    def with_param(self, name: str, value: Any) -> Self:
+        self.request = self.request.with_param(name, str(value))
+
+        return self
+
+    @cached_property
+    def response(self) -> HttpResponse:
+        return self.request()
+
+    def unpack(self) -> JsonDict:
+        return JsonDict(self.response.json()["data"][self.resource.singular])
+
+    def unpack_many(self) -> Iterable[JsonDict]:
+        items = self.response.json()["data"][self.resource.plural]
+
+        return [JsonDict(item) for item in items]
+
+    def ensure(self) -> RestResponse:
+        return RestResponse(
+            resource=self.resource,
+            json=JsonDict(self.response.json()),
+            http_code=self.response.code(),
+        )

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

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Iterable
+from typing import Any, Iterable, Self
 
 from apexdevkit.error import DoesNotExistError, ExistsError, ForbiddenError
-from apexdevkit.testing import RestfulName
+from apexdevkit.fastapi.name import RestfulName
+from apexdevkit.http import JsonDict
 
 
 @dataclass(frozen=True)
@@ -67,3 +68,66 @@ class RestfulResponse:
                 content["data"] = {self.name.singular: data}
 
         return content
+
+
+@dataclass
+class RestResponse:
+    resource: RestfulName
+    json: JsonDict
+    http_code: int
+
+    def fail(self) -> Self:
+        if self.http_code == 422:
+            return self
+
+        return self.with_status("fail")
+
+    def success(self) -> Self:
+        return self.with_status("success")
+
+    def with_status(self, value: str) -> Self:
+        assert self.json.value_of("status").to(str) == value
+
+        return self
+
+    def with_code(self, value: int) -> Self:
+        assert self.http_code == value
+
+        if self.http_code != 422:
+            assert self.json.value_of("code").to(int) == value
+
+        return self
+
+    def message(self, value: str) -> Self:
+        return self.with_message(value)
+
+    def and_message(self, value: str) -> Self:
+        return self.with_message(value)
+
+    def with_message(self, value: str) -> Self:
+        assert self.json.value_of("error").to(dict) == {"message": value}, self.json
+
+        return self
+
+    def and_item(self, value: Any) -> Self:
+        return self.with_item(value)
+
+    def with_item(self, value: Any) -> Self:
+        return self.with_data(**{self.resource.singular: value})
+
+    def and_collection(self, value: list[Any]) -> Self:
+        return self.with_collection(value)
+
+    def with_collection(self, values: list[Any]) -> Self:
+        return self.with_data(**{self.resource.plural: values}, count=len(values))
+
+    def and_no_data(self) -> Self:
+        return self.no_data()
+
+    def no_data(self) -> Self:
+        return self.with_data()
+
+    def with_data(self, **kwargs: Any) -> Self:
+        assert self.json.value_of("data").to(dict) == {**kwargs}, self.json
+
+        return self

apexdevkit-1.16.1/apexdevkit/fastapi/rest.py

@@ -0,0 +1,92 @@
+from dataclasses import dataclass
+
+from apexdevkit.fastapi.name import RestfulName
+from apexdevkit.fastapi.request import HttpRequest, RestRequest
+from apexdevkit.http import Http, HttpMethod
+
+
+@dataclass(frozen=True)
+class RestResource:
+    http: Http
+    name: RestfulName
+
+    def create_one(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.post,
+                self.http.with_endpoint(self.name.plural),
+            ),
+        )
+
+    def create_many(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.post,
+                self.http.with_endpoint(self.name.plural).with_endpoint("batch"),
+            ),
+        )
+
+    def read_one(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.get,
+                self.http.with_endpoint(self.name.plural),
+            ),
+        )
+
+    def read_all(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.get,
+                self.http.with_endpoint(self.name.plural),
+            ),
+        )
+
+    def update_one(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.patch,
+                self.http.with_endpoint(self.name.plural),
+            ),
+        )
+
+    def update_many(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.patch,
+                self.http.with_endpoint(self.name.plural),
+            ),
+        )
+
+    def replace_one(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.put,
+                self.http.with_endpoint(self.name.plural),
+            ),
+        )
+
+    def replace_many(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.put,
+                self.http.with_endpoint(self.name.plural).with_endpoint("batch"),
+            ),
+        )
+
+    def delete_one(self) -> RestRequest:
+        return RestRequest(
+            self.name,
+            HttpRequest(
+                HttpMethod.delete,
+                self.http.with_endpoint(self.name.plural),
+            ),
+        )

{apexdevkit-1.15.7 → apexdevkit-1.16.1}/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.1}/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.1}/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.16.1/apexdevkit/testing/rest.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from apexdevkit.fastapi.name import RestfulName
+from apexdevkit.fastapi.rest import 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))

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

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

apexdevkit-1.15.7/apexdevkit/testing/rest.py

@@ -1,280 +0,0 @@
-from __future__ import annotations
-
-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
-
-
-@dataclass(frozen=True)
-class RestResource:
-    http: Http
-    name: RestfulName
-
-    def create_one(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.post,
-                self.http.with_endpoint(self.name.plural),
-            ),
-        )
-
-    def create_many(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.post,
-                self.http.with_endpoint(self.name.plural).with_endpoint("batch"),
-            ),
-        )
-
-    def read_one(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.get,
-                self.http.with_endpoint(self.name.plural),
-            ),
-        )
-
-    def read_all(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.get,
-                self.http.with_endpoint(self.name.plural),
-            ),
-        )
-
-    def update_one(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.patch,
-                self.http.with_endpoint(self.name.plural),
-            ),
-        )
-
-    def update_many(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.patch,
-                self.http.with_endpoint(self.name.plural),
-            ),
-        )
-
-    def replace_one(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.put,
-                self.http.with_endpoint(self.name.plural),
-            ),
-        )
-
-    def replace_many(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.put,
-                self.http.with_endpoint(self.name.plural).with_endpoint("batch"),
-            ),
-        )
-
-    def delete_one(self) -> RestRequest:
-        return RestRequest(
-            self.name,
-            HttpRequest(
-                HttpMethod.delete,
-                self.http.with_endpoint(self.name.plural),
-            ),
-        )
-
-
-@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:
-    resource: RestfulName
-    request: HttpRequest
-
-    def with_id(self, value: Any) -> Self:
-        self.request = self.request.with_endpoint(value)
-
-        return self
-
-    def from_collection(self, value: list[JsonDict]) -> Self:
-        return self.with_data(
-            JsonDict({self.resource.plural: [dict(item) for item in value]})
-        )
-
-    def and_data(self, value: JsonDict) -> Self:
-        return self.with_data(value)
-
-    def from_data(self, value: JsonDict) -> Self:
-        return self.with_data(value)
-
-    def with_data(self, value: JsonDict) -> Self:
-        self.request = self.request.with_json(value)
-
-        return self
-
-    def and_param(self, name: str, value: Any) -> Self:
-        return self.with_param(name, value)
-
-    def with_param(self, name: str, value: Any) -> Self:
-        self.request = self.request.with_param(name, str(value))
-
-        return self
-
-    @cached_property
-    def response(self) -> HttpResponse:
-        return self.request()
-
-    def unpack(self) -> JsonDict:
-        return JsonDict(self.response.json()["data"][self.resource.singular])
-
-    def unpack_many(self) -> Iterable[JsonDict]:
-        items = self.response.json()["data"][self.resource.plural]
-
-        return [JsonDict(item) for item in items]
-
-    def ensure(self) -> RestResponse:
-        return RestResponse(
-            resource=self.resource,
-            json=JsonDict(self.response.json()),
-            http_code=self.response.code(),
-        )
-
-
-@dataclass
-class RestResponse:
-    resource: RestfulName
-    json: JsonDict
-    http_code: int
-
-    def fail(self) -> Self:
-        if self.http_code == 422:
-            return self
-
-        return self.with_status("fail")
-
-    def success(self) -> Self:
-        return self.with_status("success")
-
-    def with_status(self, value: str) -> Self:
-        assert self.json.value_of("status").to(str) == value
-
-        return self
-
-    def with_code(self, value: int) -> Self:
-        assert self.http_code == value
-
-        if self.http_code != 422:
-            assert self.json.value_of("code").to(int) == value
-
-        return self
-
-    def message(self, value: str) -> Self:
-        return self.with_message(value)
-
-    def and_message(self, value: str) -> Self:
-        return self.with_message(value)
-
-    def with_message(self, value: str) -> Self:
-        assert self.json.value_of("error").to(dict) == {"message": value}, self.json
-
-        return self
-
-    def and_item(self, value: Any) -> Self:
-        return self.with_item(value)
-
-    def with_item(self, value: Any) -> Self:
-        return self.with_data(**{self.resource.singular: value})
-
-    def and_collection(self, value: list[Any]) -> Self:
-        return self.with_collection(value)
-
-    def with_collection(self, values: list[Any]) -> Self:
-        return self.with_data(**{self.resource.plural: values}, count=len(values))
-
-    def and_no_data(self) -> Self:
-        return self.no_data()
-
-    def no_data(self) -> Self:
-        return self.with_data()
-
-    def with_data(self, **kwargs: Any) -> Self:
-        assert self.json.value_of("data").to(dict) == {**kwargs}, self.json
-
-        return self