python-general-be-lib 0.1.0__tar.gz → 0.3.0__tar.gz

{python_general_be_lib-0.1.0/python_general_be_lib.egg-info → python_general_be_lib-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-general-be-lib
-Version: 0.1.0
+Version: 0.3.0
 Summary: General purpose backend library — SQLAlchemy CRUD/Geometry repositories, FastAPI exceptions, Pydantic base models, logger utilities.
 Author-email: Andrea Di Placido <a.diplacido@arpes.it>, "Arpes S.r.l." <it.admin@arpes.it>
 License: MIT

python_general_be_lib-0.3.0/general/interface/repository/handler/__init__.py

@@ -0,0 +1,4 @@
+from .base_handler import *
+from .ilike_handler import *
+from .interval_handler import *
+from .json_handler import *

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0}/general/interface/repository/handler/base_handler.py

@@ -5,7 +5,7 @@ from typing import Any
 from sqlalchemy import Select, Update, Delete, Column, not_
 from sqlalchemy.sql.base import ReadOnlyColumnCollection
 
-from ....exception.crud_exceptions import HasNoAttributeException
+from general.exception.crud_exceptions import HasNoAttributeException
 
 
 class BaseHandler:

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0}/general/interface/repository/handler/interval_handler.py

@@ -1,3 +1,5 @@
+__all__ = ["IntervalHandler"]
+
 from typing import Any
 
 from sqlalchemy import Column, Select, Update, Delete, or_

python_general_be_lib-0.3.0/general/interface/repository/handler/json_handler.py

@@ -0,0 +1,25 @@
+__all__ = ["JsonHandler"]
+
+from typing import Any
+
+from sqlalchemy import Column, Select, Update, Delete
+from sqlalchemy.sql.base import ReadOnlyColumnCollection
+
+from .base_handler import BaseHandler
+
+
+class JsonHandler(BaseHandler):
+    __slots__ = "json_column"
+    json_column: str
+
+    def __init__(self, columns: ReadOnlyColumnCollection[str, Column[Any]]):
+        self.columns = columns
+        self.json_column = {key for key, column in columns.items() if column.type.python_type == dict}.pop()
+
+    def prepare_statement(self, stmt: Select | Update | Delete, **where):
+        json_keys = {key for key in where.keys() if key not in self.columns}
+        json_conditions = {key: where.pop(key) for key in json_keys}
+
+        stmt = super().prepare_statement(stmt=stmt, **where)
+        stmt = stmt.where(*[self.columns[self.json_column][key].as_string() == str(value) for key, value in json_conditions.items()])
+        return stmt

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0}/general/interface/repository/many_to_many_repository.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel
 from sqlalchemy.orm import Session
 
 from .crud_repository import CrudRepository
-from ...interface.base import Base
+from ..base import Base
 
 
 class ManyToManyRepository[Entity: Base | Type[Base]](CrudRepository[Entity]):

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0}/general/logger.py

@@ -21,6 +21,28 @@ color = COLOR['BLUE']
 end_color = COLOR['ENDC']
 exc_color = COLOR['RED']
 
+LOGGING_CONFIG = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "logformatter": {
+            "format": "[%(asctime)s] %(levelname)s - %(message)s"
+        }
+    },
+    "handlers": {
+        "logconsole": {
+            "class": "logging.StreamHandler",
+            "level": "INFO",
+            "formatter": "logformatter",
+            "stream": "ext://sys.stderr"
+        }
+    },
+    "root": {
+        "level": "INFO",
+        "handlers": ["logconsole"]
+    }
+}
+
 
 class EndpointFilter(logging.Filter):
     def __init__(self, endpoint: str = '', *args, **kwargs):
@@ -32,7 +54,7 @@ class EndpointFilter(logging.Filter):
 
 
 def init_logger(*filtering_endpoints: str):
-    logging.config.fileConfig(fname="./general/log_config.ini", disable_existing_loggers=True)
+    logging.config.dictConfig(LOGGING_CONFIG)
     logging.info("Logger setted up")
     [logging.getLogger("uvicorn.access").addFilter(EndpointFilter(filtering_endpoint)) for filtering_endpoint in filtering_endpoints]
 

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.backends.legacy:build"
 
 [project]
 name = "python-general-be-lib"
-version = "0.1.0"
+version = "0.3.0"
 description = "General purpose backend library — SQLAlchemy CRUD/Geometry repositories, FastAPI exceptions, Pydantic base models, logger utilities."
 readme = "README.md"
 license = { text = "MIT" }
@@ -47,8 +47,5 @@ Repository = "https://github.com/Arpes-IS/python-general-be-lib"
 where = ["."]
 include = ["general*"]
 
-[tool.setuptools.package-data]
-general = ["log_config.ini"]
-
 [tool.pytest.ini_options]
 testpaths = ["tests"]

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0/python_general_be_lib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-general-be-lib
-Version: 0.1.0
+Version: 0.3.0
 Summary: General purpose backend library — SQLAlchemy CRUD/Geometry repositories, FastAPI exceptions, Pydantic base models, logger utilities.
 Author-email: Andrea Di Placido <a.diplacido@arpes.it>, "Arpes S.r.l." <it.admin@arpes.it>
 License: MIT

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0}/python_general_be_lib.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 setup.py
 general/__init__.py
-general/log_config.ini
 general/logger.py
 general/paginator_dto.py
 general/exception/__init__.py
@@ -25,6 +24,7 @@ general/interface/repository/handler/__init__.py
 general/interface/repository/handler/base_handler.py
 general/interface/repository/handler/ilike_handler.py
 general/interface/repository/handler/interval_handler.py
+general/interface/repository/handler/json_handler.py
 python_general_be_lib.egg-info/PKG-INFO
 python_general_be_lib.egg-info/SOURCES.txt
 python_general_be_lib.egg-info/dependency_links.txt

{python_general_be_lib-0.1.0 → python_general_be_lib-0.3.0}/setup.py

@@ -2,9 +2,8 @@ from setuptools import setup, find_packages
 
 setup(
     name="python-general-be-lib",
-    version="0.1.0",
+    version="0.3.0",
     packages=find_packages(include=["general*"]),
-    package_data={"general": ["log_config.ini"]},
     python_requires=">=3.12",
     install_requires=[
         "fastapi>=0.100.0",
@@ -12,4 +11,4 @@ setup(
         "sqlalchemy>=2.0.0",
         "geoalchemy2>=0.14.0",
     ],
-)
+)

python_general_be_lib-0.1.0/general/interface/repository/handler/__init__.py

@@ -1,2 +0,0 @@
-from .base_handler import *
-from .ilike_handler import *

python_general_be_lib-0.1.0/general/log_config.ini

@@ -1,21 +0,0 @@
-[loggers]
-keys = root
-
-[handlers]
-keys = logconsole
-
-[formatters]
-keys = logformatter
-
-[logger_root]
-level = INFO
-handlers = logconsole
-
-[formatter_logformatter]
-format = [%(asctime)s] %(levelname)s - %(message)s
-
-[handler_logconsole]
-class = handlers.logging.StreamHandler
-level = INFO
-args = ()
-formatter = logformatter