moose-lib 0.4.333__tar.gz → 0.4.335__tar.gz

{moose_lib-0.4.333 → moose_lib-0.4.335}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moose_lib
-Version: 0.4.333
+Version: 0.4.335
 Home-page: https://www.fiveonefour.com/moose
 Author: Fiveonefour Labs Inc.
 Author-email: support@fiveonefour.com

{moose_lib-0.4.333 → moose_lib-0.4.335}/moose_lib/dmv2/consumption.py

@@ -17,6 +17,9 @@ from ._registry import _egress_apis
 # Global base URL configuration
 _global_base_url: Optional[str] = None
 
+def _generate_api_key(name: str, version: Optional[str] = None) -> str:
+    return f"{name}:{version}" if version else name
+
 
 def set_moose_base_url(url: str) -> None:
     """Set the global base URL for consumption API calls.
@@ -88,13 +91,32 @@ class ConsumptionApi(BaseTypedResource, Generic[U]):
 
         return curried_constructor
 
-    def __init__(self, name: str, query_function: Callable[..., U], config: EgressConfig = EgressConfig(), **kwargs):
+    def __init__(self, name: str, query_function: Callable[..., U], config: EgressConfig = None, version: str = None, **kwargs):
         super().__init__()
         self._set_type(name, self._get_type(kwargs))
-        self.config = config
+        
+        # Handle config and version parameters properly
+        if config is not None:
+            # If config is provided, use it as base
+            if version is not None:
+                # If version is also provided, update the config's version
+                self.config = EgressConfig(
+                    version=version,
+                    metadata=config.metadata
+                )
+            else:
+                # Use the provided config as-is
+                self.config = config
+        elif version is not None:
+            # Only version provided, create new config with version
+            self.config = EgressConfig(version=version)
+        else:
+            # Neither provided, use default config
+            self.config = EgressConfig()
+            
         self.query_function = query_function
-        self.metadata = config.metadata
-        _egress_apis[name] = self
+        self.metadata = getattr(self.config, 'metadata', {}) or {}
+        _egress_apis[_generate_api_key(name, self.config.version)] = self
 
     @classmethod
     def _get_type(cls, keyword_args: dict):

{moose_lib-0.4.333 → moose_lib-0.4.335}/moose_lib/internal.py

@@ -328,7 +328,7 @@ def to_infra_map() -> dict:
 
     for name, api in get_consumption_apis().items():
         egress_apis[name] = EgressApiConfig(
-            name=name,
+            name=api.name,
             query_params=_to_columns(api.model_type),
             response_schema=api.get_response_schema(),
             version=api.config.version,

{moose_lib-0.4.333 → moose_lib-0.4.335}/moose_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moose_lib
-Version: 0.4.333
+Version: 0.4.335
 Home-page: https://www.fiveonefour.com/moose
 Author: Fiveonefour Labs Inc.
 Author-email: support@fiveonefour.com