apexdevkit 1.21.12__tar.gz → 1.22.2__tar.gz

{apexdevkit-1.21.12 → apexdevkit-1.22.2}/PKG-INFO

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

{apexdevkit-1.21.12 → apexdevkit-1.22.2}/apexdevkit/fastapi/builder.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from typing import Any, Self
+from typing import Any, Mapping, Self
 
 from fastapi import APIRouter, FastAPI
+from starlette.middleware.cors import CORSMiddleware
 from starlette.responses import JSONResponse
 
 from apexdevkit.error import ApiError
@@ -44,6 +45,9 @@ class FastApiBuilder:
         return self
 
     def with_route(self, **values: APIRouter) -> Self:
+        return self.with_routes(values)
+
+    def with_routes(self, values: Mapping[str, APIRouter]) -> Self:
         for key, value in values.items():
             self.app.include_router(
                 value, prefix=f"/{key}", tags=value.tags or [key.title()]
@@ -57,6 +61,22 @@ class FastApiBuilder:
 
         return self
 
+    def with_frontend(self, origin: str) -> Self:
+        self.app.add_middleware(
+            CORSMiddleware,
+            allow_origins=[origin],
+            allow_credentials=True,
+            allow_methods=["*"],
+            allow_headers=["*"],
+        )
+
+        return self
+
+    def with_swagger(self, **config: Any) -> Self:
+        self.app.swagger_ui_parameters = config
+
+        return self
+
 
 @dataclass
 class RestfulServiceBuilder(ABC):

{apexdevkit-1.21.12 → apexdevkit-1.22.2}/apexdevkit/repository/mssql.py

@@ -151,6 +151,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
     table: str | None = None
     formatter: Formatter[Mapping[str, Any], ItemT] | None = None
     fields: list[_SqlField] | None = None
+    custom_filters: list[str] | None = None
 
     def with_username(self, value: str) -> MsSqlTableBuilder[ItemT]:
         return MsSqlTableBuilder[ItemT](
@@ -159,6 +160,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
             self.table,
             self.formatter,
             self.fields,
+            self.custom_filters,
         )
 
     def with_schema(self, value: str) -> MsSqlTableBuilder[ItemT]:
@@ -168,6 +170,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
             self.table,
             self.formatter,
             self.fields,
+            self.custom_filters,
         )
 
     def with_table(self, value: str) -> MsSqlTableBuilder[ItemT]:
@@ -177,6 +180,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
             value,
             self.formatter,
             self.fields,
+            self.custom_filters,
         )
 
     def with_formatter(
@@ -188,6 +192,7 @@ class MsSqlTableBuilder(Generic[ItemT]):
             self.table,
             value,
             self.fields,
+            self.custom_filters,
         )
 
     def with_fields(self, value: Iterable[_SqlField]) -> MsSqlTableBuilder[ItemT]:
@@ -213,17 +218,32 @@ class MsSqlTableBuilder(Generic[ItemT]):
             self.table,
             self.formatter,
             key_list,
+            self.custom_filters,
+        )
+
+    def with_custom_filters(self, filters: Iterable[str]) -> MsSqlTableBuilder[ItemT]:
+        return MsSqlTableBuilder[ItemT](
+            self.username,
+            self.schema,
+            self.table,
+            self.formatter,
+            self.fields,
+            list(filters),
         )
 
     def build(self) -> SqlTable[ItemT]:
         if not self.schema or not self.table or not self.formatter or not self.fields:
             raise ValueError("Cannot build sql table.")
 
+        field_manager = SqlFieldManager.Builder().with_fields(self.fields)
+        if self.custom_filters and len(self.custom_filters) > 0:
+            field_manager = field_manager.with_custom_filters(self.custom_filters)
+
         return DefaultSqlTable(
             self.schema,
             self.table,
             self.formatter,
-            SqlFieldManager.Builder().with_fields(self.fields).for_mssql().build(),
+            field_manager.for_mssql().build(),
             self.username,
         )
 

{apexdevkit-1.21.12 → apexdevkit-1.22.2}/apexdevkit/repository/sql.py

@@ -120,6 +120,7 @@ class SqlFieldBuilder:
 @dataclass
 class SqlFieldManager:
     fields: list[_SqlField]
+    custom_filters: list[str]
     key_formatter: str
     value_formatter: str
 
@@ -209,7 +210,7 @@ class SqlFieldManager:
         )
 
     def _general_filters(self) -> str:
-        statements: list[str] = []
+        statements: list[str] = [] + self.custom_filters
         for key in self.fields:
             if key.is_filter:
                 inner_statements: list[str] = []
@@ -237,6 +238,8 @@ class SqlFieldManager:
 
     @dataclass
     class Builder:
+        custom_filters: list[str] = field(default_factory=list)
+
         fields: list[_SqlField] = field(init=False)
         key_formatter: str = field(init=False)
         value_formatter: str = field(init=False)
@@ -246,6 +249,11 @@ class SqlFieldManager:
 
             return self
 
+        def with_custom_filters(self, fields: list[str]) -> SqlFieldManager.Builder:
+            self.custom_filters = fields
+
+            return self
+
         def for_sqlite(self) -> SqlFieldManager.Builder:
             self.key_formatter = "x"
             self.value_formatter = ":x"
@@ -260,5 +268,8 @@ class SqlFieldManager:
 
         def build(self) -> SqlFieldManager:
             return SqlFieldManager(
-                self.fields, self.key_formatter, self.value_formatter
+                self.fields,
+                self.custom_filters,
+                self.key_formatter,
+                self.value_formatter,
             )

{apexdevkit-1.21.12 → apexdevkit-1.22.2}/pyproject.toml

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