ul-api-utils 7.8.9__tar.gz → 7.9.1__tar.gz

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 7.8.9
+Version: 7.9.1
 Summary: Python api utils
 Author: Unic-lab
 Author-email: 

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/example/conf.py

@@ -1,6 +1,6 @@
 import os
 
-from ul_db_utils.modules.db import DbConfig
+from ul_db_utils.modules.postgres_modules.db import DbConfig
 
 from ul_api_utils.modules.api_sdk import ApiSdk
 from ul_api_utils.modules.api_sdk_config import ApiSdkConfig, ApiSdkIdentifyTypeEnum, \

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/example/routes/api_some.py

@@ -8,7 +8,7 @@ from flask_socketio import emit
 from ul_api_utils.resources.sockets import socket_io
 from flask import jsonify
 from pydantic import BaseModel
-from ul_db_utils.modules.db import db
+from ul_db_utils.modules.postgres_modules.db import db
 from werkzeug import Response as BaseResponse
 from flask import request
 from example.conf import sdk

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/setup.py

@@ -9,7 +9,7 @@ with open(path.join(HERE, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='ul-api-utils',
-    version='7.8.9',
+    version='7.9.1',
     description='Python api utils',
     author='Unic-lab',
     long_description=long_description,

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/ul_api_utils/commands/cmd_generate_api_docs.py

@@ -51,8 +51,7 @@ class CmdGenApiFunctionDocumentation(Cmd):
         csv_data: List[Dict[str, str]] = []
         with current_app.app_context():
             now = datetime.now().isoformat()
-            filename = f'.tmp/api-doc-{now}/doc.md'
-            os.makedirs(os.path.dirname(filename), exist_ok=True)
+            filename = f'.tmp/{now}-doc.md'
             with open(filename, 'w') as file:
                 for api_route_id, flask_api_rule in enumerate(current_app.url_map.iter_rules()):
                     options = {}
@@ -78,7 +77,7 @@ class CmdGenApiFunctionDocumentation(Cmd):
                         loaded_api_utils_functions=api_utils_functions,
                         loaded_db_utils_functions=db_utils_functions,
                     )
-        with open(f'.tmp/api-doc-{now}/doc.csv', 'w') as csvfile:
+        with open(f'.tmp/{now}-doc.csv', 'w') as csvfile:
             fields = ['api_path', 'api_methods', 'api_function_name']
             writer = csv.DictWriter(csvfile, fieldnames=fields)
             writer.writeheader()

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/ul_api_utils/modules/api_sdk.py

@@ -52,7 +52,7 @@ from ul_api_utils.utils.uuid_converter import UUID4Converter
 if TYPE_CHECKING:
     import flask_sqlalchemy
     from flask_mongoengine import MongoEngine      # type: ignore # lib without mypy stubs
-    from ul_db_utils.modules.db import DbConfig
+    from ul_db_utils.modules.postgres_modules.db import DbConfig
     from ul_db_utils.modules.mongo_db_modules.db import MongoDbConfig
 
 TFn = TypeVar("TFn", bound=Callable[..., ApiResponse])
@@ -142,7 +142,7 @@ class ApiSdk:
 
         if db_config is not None and type(db_config).__name__ == 'DbConfig':
             from ul_db_utils.utils.waiting_for_postgres import waiting_for_postgres
-            from ul_db_utils.modules.db import db       # type: ignore # yes, db already defined, but can not use two conigs
+            from ul_db_utils.modules.postgres_modules.db import db       # type: ignore # yes, db already defined, but can not use two conigs
             db_config._init_from_sdk_with_flask(self)
             waiting_for_postgres(db_config.uri)
             self._db = db

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/ul_api_utils/modules/worker_sdk.py

@@ -15,7 +15,7 @@ from ul_api_utils.modules.worker_sdk_config import WorkerSdkConfig
 from ul_api_utils.sentry import sentry
 
 if TYPE_CHECKING:
-    from ul_db_utils.modules.db import DbConfig
+    from ul_db_utils.modules.postgres_modules.db import DbConfig
 
 TI = TypeVar('TI', bound=UniMessage)
 TO = TypeVar('TO', bound=UniMessage)
@@ -84,7 +84,7 @@ class WorkerSdk:
 
                     db_instance = None
                     if self._db_initialized:
-                        from ul_db_utils.modules import db
+                        from ul_db_utils.modules.postgres_modules import db
                         db_instance = db.db
 
                     ctx = WorkerContext(

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/ul_api_utils/resources/debugger_scripts.py

@@ -83,7 +83,7 @@ def load_debugger_static_scripts(sdk: 'ApiSdk') -> None:
                     api_result = api.request_post('/debugger-explain', v=ApiPathVersion.NO_VERSION, json=api_body).check().typed(DebuggerExplainResponse)
                     return api_resource.response_ok(api_result.payload)
 
-        from ul_db_utils.modules.db import db
+        from ul_db_utils.modules.postgres_modules.db import db
         options = 'COSTS ' + ('TRUE' if body.costs else 'FALSE')
         options += ', SUMMARY ' + ('TRUE' if body.summary else 'FALSE')
         options += ', VERBOSE ' + ('TRUE' if body.verbose else 'FALSE')

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/ul_api_utils/resources/web_forms/uni_form.py

@@ -1,6 +1,6 @@
 from typing import Type, Any, Dict, Optional, Tuple
 
-from ul_db_utils.modules.db import db
+from ul_db_utils.modules.postgres_modules.db import db
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.dialects.postgresql import ARRAY
 from wtforms_alchemy import ModelForm, ClassMap, FormGenerator  # type: ignore

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/ul_api_utils/utils/json_encoder.py

@@ -25,7 +25,7 @@ def to_dict(obj: 'TDictable') -> Optional[Dict[str, Any]]:
     if isinstance(obj, BaseModel):
         return obj.dict()
     if has_already_imported_db():
-        from ul_db_utils.modules.db import DbModel
+        from ul_db_utils.modules.postgres_modules.db import DbModel
         from flask_sqlalchemy import BaseQuery, Model
         from sqlalchemy.orm import registry
         from ul_db_utils.model.base_model import BaseModel as DbBaseModel

{ul-api-utils-7.8.9 → ul-api-utils-7.9.1}/ul_api_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 7.8.9
+Version: 7.9.1
 Summary: Python api utils
 Author: Unic-lab
 Author-email: