rb-commons 0.5.14__py3-none-any.whl → 0.5.16__py3-none-any.whl

rb_commons/configs/config.py

@@ -25,19 +25,6 @@ class CommonConfigs(BaseSettings):
     DIGITALOCEAN_STORAGE_BUCKET_NAME: Optional[str] = None
     DIGITALOCEAN_S3_ENDPOINT_URL: Optional[str] = None
 
-    @field_validator("POSTGRES_PORT", mode="before")
-    @classmethod
-    def convert_port(cls, value):
-        print("DEBUG: POSTGRES_PORT from env =", value)
-
-        if value is None:
-            return None
-        try:
-            print(value)
-            return int(value)
-        except ValueError:
-            raise ValueError(f"POSTGRES_PORT must be an integer, got: {value}")
-
     @property
     def database_url(self) -> Optional[str]:
         """Construct the database URL if all required fields are present."""

rb_commons/configs/v2/config.py

@@ -0,0 +1,52 @@
+from typing import Optional, Any
+
+from pydantic import field_validator
+from pydantic_settings import BaseSettings
+
+class CommonConfigs(BaseSettings):
+    service_name: Optional[str] = None
+    service_port: Optional[int] = None
+    service_id: Optional[str] = None
+    service_hostname: Optional[Any] = '127.0.0.1'
+    service_host: Optional[str] = None
+
+#     db
+    POSTGRES_HOST: Optional[str] = None
+    POSTGRES_USER: Optional[str] = None
+    POSTGRES_PORT: Optional[int] = None
+    POSTGRES_PASSWORD: Optional[str] = None
+    POSTGRES_DB: Optional[str] = None
+    DB_ALEMBIC_URL: Optional[str] = None
+
+    # Broker
+
+    RABBITMQ_URL: Optional[str] = None
+
+    DIGITALOCEAN_STORAGE_BUCKET_NAME: Optional[str] = None
+    DIGITALOCEAN_S3_ENDPOINT_URL: Optional[str] = None
+
+    @property
+    def database_url(self) -> Optional[str]:
+        """Construct the database URL if all required fields are present."""
+        required_fields = [
+            self.POSTGRES_USER,
+            self.POSTGRES_PASSWORD,
+            self.POSTGRES_HOST,
+            self.POSTGRES_PORT,
+            self.POSTGRES_DB
+        ]
+        if all(required_fields):
+            return (
+                f"postgresql+asyncpg://{self.POSTGRES_USER}:"
+                f"{self.POSTGRES_PASSWORD}@{self.POSTGRES_HOST}:"
+                f"{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
+            )
+        return None
+
+    class Config:
+        env_file = "/robosell/.env"
+        env_file_encoding = "utf-8"
+        extra = "ignore"
+
+
+configs = CommonConfigs()

rb_commons/http/base_api.py

@@ -66,25 +66,22 @@ class BaseAPI:
                 else:
                     data = {}
             except ValueError as e:
-                raise BadRequestException(f"Invalid JSON response: {response.text}")
-
+                error_message = data.get("message") or data.get("detail") or response.text
+                raise BadRequestException(f"Invalid JSON response: {response.text}", additional_info={"error_message": error_message})
             if not (200 <= response.status_code < 300):
-                error_message = data.get("message")
-                if error_message is not None:
-                    raise BadRequestException(error_message)
-
-                raise BadRequestException(f"Unexpected error occured: {response.text}")
+                error_message = data.get("message") or data.get("detail") or response.text
+                raise BadRequestException(f"Unexpected error occured: {response.text}", additional_info={"error_message": error_message})
 
             return response
 
         except RequestException as e:
-            raise BadRequestException(f"Request failed: {e}")
-        except BadRequestException as e:
-            raise BadRequestException(e.message)
+            raise BadRequestException(f"Request exception: {str(e)}", additional_info={"error_message": str(e)})
+        except BadRequestException:
+            raise
         except (json.JSONDecodeError, ValueError) as e:
-            raise InternalException(f"Failed to parse JSON: {e}")
+            raise InternalException(f"Failed to parse JSON: {str(e)}")
         except Exception as e:
-            raise InternalException("Something went wrong")
+            raise InternalException(f"Unhandled error: {str(e)}")
 
     def _post(self, path: str, data: dict | list, headers: dict = None, params: dict = None, reset_base_url: bool = False, form_encoded: bool = False) -> requests.Response:
         return self._make_request('POST', path, data=data, headers=headers, params=params, reset_base_url=reset_base_url, form_encoded=form_encoded)

rb_commons/utils/media.py

@@ -1,9 +1,18 @@
-from rb_commons.configs.config import configs
+from pydantic import ValidationError
 
 class MediaUtils:
 
     @staticmethod
     def url_builder(key: str):
+        try:
+            from rb_commons.configs.config import configs
+            DIGITALOCEAN_S3_ENDPOINT_URL = configs.DIGITALOCEAN_S3_ENDPOINT_URL
+            DIGITALOCEAN_STORAGE_BUCKET_NAME = configs.DIGITALOCEAN_STORAGE_BUCKET_NAME
+        except ValidationError as e:
+            from rb_commons.configs.v2.config import configs
+            DIGITALOCEAN_S3_ENDPOINT_URL = configs.DIGITALOCEAN_S3_ENDPOINT_URL
+            DIGITALOCEAN_STORAGE_BUCKET_NAME = configs.DIGITALOCEAN_STORAGE_BUCKET_NAME
+
         return "{endpoint_url}/{bucket_name}/{key}" \
-            .format(endpoint_url=configs.DIGITALOCEAN_S3_ENDPOINT_URL,
-                    bucket_name=configs.DIGITALOCEAN_STORAGE_BUCKET_NAME, key=key)
+            .format(endpoint_url=DIGITALOCEAN_S3_ENDPOINT_URL,
+                    bucket_name=DIGITALOCEAN_STORAGE_BUCKET_NAME, key=key)

{rb_commons-0.5.14.dist-info → rb_commons-0.5.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.14
+Version: 0.5.16
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.5.14.dist-info → rb_commons-0.5.16.dist-info}/RECORD

@@ -2,11 +2,13 @@ rb_commons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/broker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/broker/consumer.py,sha256=84yLq8kJIGNYAH9_ySSTDpOMNL54NSs3cA8lNG8CTGY,1264
 rb_commons/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/configs/config.py,sha256=E501qNU9ATQEOGKlNnZejehU4Yj5pAwAz2aTrvOZ75k,1971
+rb_commons/configs/config.py,sha256=1XVqxb9QY0E3P3n7vRJF_w238WgRpArfPVcpeT3geUE,1571
 rb_commons/configs/injections.py,sha256=6B1EOgIGnkWv3UrFaV9PRgG0-CJAbLu1UZ3kq-SjPVU,273
 rb_commons/configs/rabbitmq.py,sha256=vUqa_PcZkPp1lX0B6HLSAXVMUcPR2_8-8cN-C7xFxRI,741
+rb_commons/configs/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rb_commons/configs/v2/config.py,sha256=kZ02y_HIMD-SXqA990yR1r9qrkpvzwn4Nda6fhVMcmo,1581
 rb_commons/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/http/base_api.py,sha256=Kpr8qSbRtoAqB9oBzXJvZjspJpMoCmq8EDGSrItPFSA,5169
+rb_commons/http/base_api.py,sha256=L4bZmJJrtfIp0N9vdlc9m8FzyZXb3dZ7_RMe4RQVers,5313
 rb_commons/http/consul.py,sha256=Ioq72VD1jGwoC96set7n2SgxN40olzI-myA2lwKkYi4,1864
 rb_commons/http/exceptions.py,sha256=EGRMr1cRgiJ9Q2tkfANbf0c6-zzXf1CD6J3cmCaT_FA,1885
 rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,8 +21,8 @@ rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 rb_commons/schemes/jwt.py,sha256=4MLw3J1-LiU2CXIgm0kP1mlGoDmNfMXmj9iav2s-1Iw,2056
 rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
-rb_commons-0.5.14.dist-info/METADATA,sha256=urSAiGh-Tz0zO-AXXIooTHwCYiGwhM49Stpsoo1g_Rk,6571
-rb_commons-0.5.14.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-rb_commons-0.5.14.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.14.dist-info/RECORD,,
+rb_commons/utils/media.py,sha256=J2Zi0J28DhcVQVzt-myNNVuzj9Msaetul53VjZtdDdc,820
+rb_commons-0.5.16.dist-info/METADATA,sha256=Qe3eYj1PSMM85qmjtBzpY8TxcbOIAQjqQShsH56p_Lk,6571
+rb_commons-0.5.16.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+rb_commons-0.5.16.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.16.dist-info/RECORD,,

{rb_commons-0.5.14.dist-info → rb_commons-0.5.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any