rb-commons 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

rb_commons/http/base_api.py

@@ -73,6 +73,8 @@ class BaseAPI:
 
         except RequestException as e:
             raise BadRequestException(f"Request failed: {e}")
+        except BadRequestException as e:
+            raise BadRequestException(e.message)
         except (json.JSONDecodeError, ValueError) as e:
             raise InternalException(f"Failed to parse JSON: {e}")
         except Exception as e:

rb_commons/http/consul.py

@@ -9,7 +9,7 @@ class ServiceDiscovery:
         self.consul_client = consul.Consul(host=configs.consul_host, port=configs.consul_port)
         self.cache = aiocache.Cache(aiocache.SimpleMemoryCache)
 
-    async def get_service_instances(self, service_name: str) -> dict:
+    async def _get_service_instances(self, service_name: str) -> dict:
         """Get a healthy service instance from Consul"""
         index, services = self.consul_client.health.service(service_name, passing=True)
 
@@ -18,12 +18,12 @@ class ServiceDiscovery:
                                 detail="Service not available")
         return services
 
-    def select_instance(self, instances: list, request: Request) -> dict:
+    def _select_instance(self, instances: list, host: str) -> dict:
         """Select instance using consistent hashing"""
         if not instances:
             raise HTTPException(status_code=503, detail="No healthy instances")
 
-        key = request.client.host
+        key = host
         hash_value = hash(key)
         return instances[hash_value % len(instances)]
 
@@ -32,15 +32,13 @@ class ServiceDiscovery:
         cache_key = f"service:{service_name}"
         instances = await self.cache.get(cache_key)
         if not instances:
-            instances = await self.get_service_instances(service_name)
+            instances = await self._get_service_instances(service_name)
             if instances:
                 await self.cache.set(cache_key, instances, ttl=30)  # Cache for 30 seconds
         return instances
 
-    def build_target_url(self, instance: dict, path: str,
-                          request: Request) -> str:
+    def _build_instance_url(self, instance: dict) -> str:
         """Build target URL with proper path handling"""
         service_address = instance['Service']['Address'] or instance['Node']['Address']
         service_port = instance['Service']['Port']
-        target_path = request.url.path.replace(path, "", 1)
-        return f"http://{service_address}:{service_port}{path}{target_path}"
+        return f"http://{service_address}:{service_port}"

{rb_commons-0.2.4.dist-info → rb_commons-0.2.6.dist-info}/METADATA

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

{rb_commons-0.2.4.dist-info → rb_commons-0.2.6.dist-info}/RECORD

@@ -6,8 +6,8 @@ rb_commons/configs/config.py,sha256=zla62zy3UfjE2YpvSDwsfhP2Qsm0BbGsycngfyiVvE4,
 rb_commons/configs/injections.py,sha256=6B1EOgIGnkWv3UrFaV9PRgG0-CJAbLu1UZ3kq-SjPVU,273
 rb_commons/configs/rabbitmq.py,sha256=vUqa_PcZkPp1lX0B6HLSAXVMUcPR2_8-8cN-C7xFxRI,741
 rb_commons/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/http/base_api.py,sha256=W-nXoO0TcngSMVgmJHFRdXeOrI9FDPi36I_Ih8hP3VE,4824
-rb_commons/http/consul.py,sha256=fFqvMueo_-AWxOE4NEsikC4tvHbS6QD8l5JnoW8jyIQ,2026
+rb_commons/http/base_api.py,sha256=H0y5eClRzDMPeltSYeUd0xNCl6iqTD-7cW809Juv9_I,4916
+rb_commons/http/consul.py,sha256=mjMjLH7l7ub6A-_84impzDTwLjTXlwMG_VRlaNSFslc,1872
 rb_commons/http/exceptions.py,sha256=EGRMr1cRgiJ9Q2tkfANbf0c6-zzXf1CD6J3cmCaT_FA,1885
 rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/orm/exceptions.py,sha256=1aMctiEwrPjyehoXVX1l6ML5ZOhmDkmBISzlTD5ey1Y,509
@@ -18,7 +18,7 @@ rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 rb_commons/schemes/jwt.py,sha256=F66JJDhholuOPPzlKeoC6f1TL4gXg4oRUrV5yheNpyo,1675
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
-rb_commons-0.2.4.dist-info/METADATA,sha256=I_QUMkGmUek2TX9zJIDw_U5Ws0lV5JhrwXS22Tw-t_g,6570
-rb_commons-0.2.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.2.4.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.2.4.dist-info/RECORD,,
+rb_commons-0.2.6.dist-info/METADATA,sha256=o0oX_BS0KiCefgYhAnz-CtK8O0vLO06NNvSAL7wpxsw,6570
+rb_commons-0.2.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.2.6.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.2.6.dist-info/RECORD,,