moose-lib 0.6.57__py3-none-any.whl → 0.6.58__py3-none-any.whl

moose_lib/dmv2/_registry.py

@@ -13,5 +13,7 @@ _ingest_apis: Dict[str, Any] = {}
 _apis: Dict[str, Any] = {}
 # Alias map for O(1) fallback of sole versioned APIs: base name -> handler
 _api_name_aliases: Dict[str, Any] = {}
+# Map from custom paths to API instances for path-based lookup
+_api_path_map: Dict[str, Any] = {}
 _sql_resources: Dict[str, Any] = {}
-_workflows: Dict[str, Any] = {} 
+_workflows: Dict[str, Any] = {}

moose_lib/dmv2/consumption.py

@@ -12,7 +12,7 @@ from pydantic import BaseModel
 from pydantic.json_schema import JsonSchemaValue
 
 from .types import BaseTypedResource, T, U
-from ._registry import _apis, _api_name_aliases
+from ._registry import _apis, _api_name_aliases, _api_path_map
 
 # Global base URL configuration
 _global_base_url: Optional[str] = None
@@ -48,9 +48,11 @@ class ApiConfig(BaseModel):
 
     Attributes:
         version: Optional version string.
+        path: Optional custom path for the API endpoint. If not specified, defaults to the API name.
         metadata: Optional metadata for the API.
     """
     version: Optional[str] = None
+    path: Optional[str] = None
     metadata: Optional[dict] = None
 
 
@@ -113,12 +115,68 @@ class Api(BaseTypedResource, Generic[U]):
         else:
             # Neither provided, use default config
             self.config = ApiConfig()
-            
+
         self.query_function = query_function
         self.metadata = getattr(self.config, 'metadata', {}) or {}
         key = _generate_api_key(name, self.config.version)
+
+        # Check for duplicate registration
+        if key in _apis:
+            raise ValueError(
+                f"Consumption API with name {name} and version {self.config.version} already exists"
+            )
         _apis[key] = self
 
+        # Register by custom path if provided
+        if self.config.path:
+            # For unversioned APIs or when path should be used as-is
+            if self.config.version is None:
+                # Check for collision
+                if self.config.path in _api_path_map:
+                    existing = _api_path_map[self.config.path]
+                    raise ValueError(
+                        f'Cannot register API "{name}" with custom path "{self.config.path}" - '
+                        f'this path is already used by API "{existing.name}"'
+                    )
+                # Only register unversioned path for unversioned APIs
+                _api_path_map[self.config.path] = self
+            else:
+                # For versioned APIs, check if version is already in the path
+                path_ends_with_version = (
+                    self.config.path.endswith(f"/{self.config.version}") or
+                    self.config.path == self.config.version or
+                    (self.config.path.endswith(self.config.version) and 
+                     len(self.config.path) > len(self.config.version) and
+                     self.config.path[-(len(self.config.version) + 1)] == '/')
+                )
+                
+                if path_ends_with_version:
+                    # Path already contains version, check for collision
+                    if self.config.path in _api_path_map:
+                        existing = _api_path_map[self.config.path]
+                        raise ValueError(
+                            f'Cannot register API "{name}" with path "{self.config.path}" - '
+                            f'this path is already used by API "{existing.name}"'
+                        )
+                    _api_path_map[self.config.path] = self
+                else:
+                    # Path doesn't contain version, register with version appended
+                    path_with_version = f"{self.config.path.rstrip('/')}/{self.config.version}"
+                    
+                    # Check for collision on versioned path
+                    if path_with_version in _api_path_map:
+                        existing = _api_path_map[path_with_version]
+                        raise ValueError(
+                            f'Cannot register API "{name}" with path "{path_with_version}" - '
+                            f'this path is already used by API "{existing.name}"'
+                        )
+                    _api_path_map[path_with_version] = self
+                    
+                    # Also register the unversioned path if not already claimed
+                    # (This is intentionally more permissive - first API gets the unversioned path)
+                    if self.config.path not in _api_path_map:
+                        _api_path_map[self.config.path] = self
+
         # Maintain alias for base name:
         # - If explicit unversioned registered, alias -> that
         # - Else, if exactly one versioned exists, alias -> that
@@ -205,8 +263,27 @@ class Api(BaseTypedResource, Generic[U]):
                 "MOOSE_BASE_URL environment variable, or pass base_url parameter."
             )
 
-        # Construct the API endpoint URL
-        url = f"{effective_base_url.rstrip('/')}/api/{self.name}"
+        # Construct the API endpoint URL using custom path or default to name
+        if self.config.path:
+            # Check if the custom path already contains the version
+            if self.config.version:
+                path_ends_with_version = (
+                    self.config.path.endswith(f"/{self.config.version}") or
+                    self.config.path == self.config.version or
+                    (self.config.path.endswith(self.config.version) and 
+                     len(self.config.path) > len(self.config.version) and
+                     self.config.path[-(len(self.config.version) + 1)] == '/')
+                )
+                if path_ends_with_version:
+                    path = self.config.path
+                else:
+                    path = f"{self.config.path.rstrip('/')}/{self.config.version}"
+            else:
+                path = self.config.path
+        else:
+            # Default to name with optional version
+            path = self.name if not self.config.version else f"{self.name}/{self.config.version}"
+        url = f"{effective_base_url.rstrip('/')}/api/{path}"
 
         # Convert Pydantic model to dictionary
         params_dict = params.model_dump()

moose_lib/dmv2/ingest_api.py

@@ -17,9 +17,11 @@ class IngestConfig(BaseModel):
 
     Attributes:
         version: Optional version string.
+        path: Optional custom path for the ingestion endpoint.
         metadata: Optional metadata for the ingestion point.
     """
     version: Optional[str] = None
+    path: Optional[str] = None
     metadata: Optional[dict] = None
 
 @dataclasses.dataclass
@@ -28,12 +30,15 @@ class IngestConfigWithDestination[T: BaseModel]:
 
     Attributes:
         destination: The `Stream` where ingested data will be sent.
+        dead_letter_queue: Optional dead letter queue for failed messages.
         version: Optional version string.
+        path: Optional custom path for the ingestion endpoint.
         metadata: Optional metadata for the ingestion configuration.
     """
     destination: Stream[T]
     dead_letter_queue: Optional[DeadLetterQueue[T]] = None
     version: Optional[str] = None
+    path: Optional[str] = None
     metadata: Optional[dict] = None
 
 class IngestApi(TypedMooseResource, Generic[T]):

moose_lib/dmv2/ingest_pipeline.py

@@ -24,7 +24,9 @@ class IngestPipelineConfig(BaseModel):
         table: Configuration for the OLAP table component.
         stream: Configuration for the stream component.
         ingest: Configuration for the ingest API component.
+        dead_letter_queue: Configuration for the dead letter queue.
         version: Optional version string applied to all created components.
+        path: Optional custom path for the ingestion API endpoint.
         metadata: Optional metadata for the ingestion pipeline.
         life_cycle: Determines how changes in code will propagate to the resources.
     """
@@ -33,6 +35,7 @@ class IngestPipelineConfig(BaseModel):
     ingest: bool | IngestConfig = True
     dead_letter_queue: bool | StreamConfig = True
     version: Optional[str] = None
+    path: Optional[str] = None
     metadata: Optional[dict] = None
     life_cycle: Optional[LifeCycle] = None
 
@@ -154,6 +157,8 @@ class IngestPipeline(TypedMooseResource, Generic[T]):
             ingest_config_dict["destination"] = self.stream
             if config.version:
                 ingest_config_dict["version"] = config.version
+            if config.path:
+                ingest_config_dict["path"] = config.path
             if self.dead_letter_queue:
                 ingest_config_dict["dead_letter_queue"] = self.dead_letter_queue
             ingest_config_dict["metadata"] = ingest_metadata

moose_lib/dmv2/registry.py

@@ -19,6 +19,7 @@ from ._registry import (
     _sql_resources,
     _workflows,
     _api_name_aliases,
+    _api_path_map,
 )
 
 def get_tables() -> Dict[str, OlapTable]:
@@ -50,11 +51,25 @@ def get_apis() -> Dict[str, Api]:
     return _apis
 
 def get_api(name: str) -> Optional[Api]:
-    """Get a registered API by name.
+    """Get a registered API by name or path.
 
-    Supports unversioned lookup by name via alias map when only a single versioned API exists.
+    Supports:
+    - Direct lookup by name:version
+    - Unversioned lookup by name via alias map when only a single versioned API exists
+    - Lookup by custom path (if configured)
     """
-    return _apis.get(name) or _api_name_aliases.get(name)
+    # Try direct lookup first
+    api = _apis.get(name)
+    if api:
+        return api
+    
+    # Try alias lookup
+    api = _api_name_aliases.get(name)
+    if api:
+        return api
+    
+    # Try path-based lookup
+    return _api_path_map.get(name)
 
 def get_sql_resources() -> Dict[str, SqlResource]:
     """Get all registered SQL resources."""

moose_lib/internal.py

@@ -172,7 +172,9 @@ class IngestApiConfig(BaseModel):
         name: Name of the Ingest API.
         columns: List of columns expected in the input data.
         write_to: The target stream where the ingested data is written.
+        dead_letter_queue: Optional dead letter queue name.
         version: Optional version string of the API configuration.
+        path: Optional custom path for the ingestion endpoint.
         metadata: Optional metadata for the API.
     """
     model_config = model_config
@@ -182,6 +184,7 @@ class IngestApiConfig(BaseModel):
     write_to: Target
     dead_letter_queue: Optional[str] = None
     version: Optional[str] = None
+    path: Optional[str] = None
     metadata: Optional[dict] = None
     json_schema: dict[str, Any] = Field(serialization_alias="schema")
 
@@ -194,6 +197,7 @@ class InternalApiConfig(BaseModel):
         query_params: List of columns representing the expected query parameters.
         response_schema: JSON schema definition of the API's response body.
         version: Optional version string of the API configuration.
+        path: Optional custom path for the API endpoint.
         metadata: Optional metadata for the API.
     """
     model_config = model_config
@@ -202,6 +206,7 @@ class InternalApiConfig(BaseModel):
     query_params: List[Column]
     response_schema: JsonSchemaValue
     version: Optional[str] = None
+    path: Optional[str] = None
     metadata: Optional[dict] = None
 
 
@@ -479,6 +484,7 @@ def to_infra_map() -> dict:
             name=name,
             columns=_to_columns(api._t),
             version=api.config.version,
+            path=api.config.path,
             write_to=Target(
                 kind="stream",
                 name=api.config.destination.name
@@ -496,6 +502,7 @@ def to_infra_map() -> dict:
             query_params=_to_columns(api.model_type),
             response_schema=api.get_response_schema(),
             version=api.config.version,
+            path=api.config.path,
             metadata=getattr(api, "metadata", None),
         )
 

{moose_lib-0.6.57.dist-info → moose_lib-0.6.58.dist-info}/METADATA

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

{moose_lib-0.6.57.dist-info → moose_lib-0.6.58.dist-info}/RECORD

@@ -2,8 +2,8 @@ moose_lib/__init__.py,sha256=LiUdVqmtASPqbMF53dXVZzCdU1jtFVx62_tiSbW65a0,162
 moose_lib/blocks.py,sha256=gC8dlV3HI4R8lO2wAxgLzn8WjKEMBjLiKyNAy4bssGE,11379
 moose_lib/commons.py,sha256=FUpRv8D3-LeGcjhcqtDyiimz5izwpCq53h50ydxC_uA,3711
 moose_lib/data_models.py,sha256=HT8ROf7HLS_BBlWvF-zGR7P-4gYURdMgfMlXa0O4i4s,10744
-moose_lib/dmv2-serializer.py,sha256=CL_Pvvg8tJOT8Qk6hywDNzY8MYGhMVdTOw8arZi3jng,49
-moose_lib/internal.py,sha256=MPSdZkJBi0tNyKTAkcT5pexraUo6roeNbg1L6gCsX68,20832
+moose_lib/dmv2_serializer.py,sha256=CL_Pvvg8tJOT8Qk6hywDNzY8MYGhMVdTOw8arZi3jng,49
+moose_lib/internal.py,sha256=InJ3Mw5E3kZU8LSZLw7NTqQtsCLeNeOHpzc9ueO__FM,21142
 moose_lib/main.py,sha256=dLcRE4jshP6ViDVLj--Y83QRsEp0dpwh7WilSEZ4ICk,18541
 moose_lib/query_param.py,sha256=kxcR09BMIsEg4o2qetjKrVu1YFRaLfMEzwzyGsKUpvA,6474
 moose_lib/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,14 +12,14 @@ moose_lib/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 moose_lib/config/config_file.py,sha256=NyjY6YFraBel7vBk18lLkpGaPR1viKMAEv4ZldyfLIA,2585
 moose_lib/config/runtime.py,sha256=h4SXRn4Mlbeh02lKN7HX2Mdp3QzySnZOeSvm8G-B3ko,3857
 moose_lib/dmv2/__init__.py,sha256=3DVAtNMZUoP94CMJBFhuXfYEQXDbQUNKSgg9XnKqae0,2768
-moose_lib/dmv2/_registry.py,sha256=RweMQWHSvhxgSceZ5mfd0NGnJ-49VZORbaFmw-O0bFY,611
-moose_lib/dmv2/consumption.py,sha256=f43XPgJn1JLPPEpYbJ1FQ8Efi92YJH7DWa1wb5TY38g,8747
-moose_lib/dmv2/ingest_api.py,sha256=Snek9NGwaJl_BuImSWGtQq91m9D3AJ4qBoGiKZ-9yTQ,2323
-moose_lib/dmv2/ingest_pipeline.py,sha256=2tDM4gCjQMdDRDjvymI5Z1DlkXULx9nY4nG9M3YXpjk,7033
+moose_lib/dmv2/_registry.py,sha256=gsLuWOvekgQRVvjVjPRHW2hN48LWyOWpLSpS2I-CWHc,708
+moose_lib/dmv2/consumption.py,sha256=sWfGwgCBQIIrhFEbx1CULfoN3rFFoy8uCBUefu4ejiw,12928
+moose_lib/dmv2/ingest_api.py,sha256=XhvHHgGPXp-BuRpAALth-FRhanwy-zJQ_83Cg_RLolM,2586
+moose_lib/dmv2/ingest_pipeline.py,sha256=dECi4ZM5G6me2rJM_2xzATmTFsJGxhI-cyOs5CnbTFs,7284
 moose_lib/dmv2/life_cycle.py,sha256=wl0k6yzwU1MJ_fO_UkN29buoY5G6ChYZvfwigP9fVfM,1254
 moose_lib/dmv2/materialized_view.py,sha256=3JbNLC26p7xOQK0DpgkreWKx7k5V3x3bz9a7kjDqKuU,4876
 moose_lib/dmv2/olap_table.py,sha256=fqGEphHubfR3oxVb6cXwmHVgx7gvb5QO7GCgDNnwAJI,33938
-moose_lib/dmv2/registry.py,sha256=janjYszIXDnMfuwkNhoiBmMLar3umQ3Npw9Ms-u6p-8,2373
+moose_lib/dmv2/registry.py,sha256=SZOXhSC3kizhPHKQN6ZWzoMZHl90AUG3H_WKVev5zIU,2680
 moose_lib/dmv2/sql_resource.py,sha256=kUZoGqxhZMHMthtBZGYJBxTFjXkspXiWLXhJRYXgGUM,1864
 moose_lib/dmv2/stream.py,sha256=jiUWBsjFalLLP63mikOxyHRdieiDAlzf9lXfLye-Wjc,10761
 moose_lib/dmv2/types.py,sha256=5FsB0HLHFkYB-8cjJ0rtRUjqahVA-ToLr2JXT1lFiss,3276
@@ -34,7 +34,7 @@ tests/conftest.py,sha256=ZVJNbnr4DwbcqkTmePW6U01zAzE6QD0kNAEZjPG1f4s,169
 tests/test_moose.py,sha256=mBsx_OYWmL8ppDzL_7Bd7xR6qf_i3-pCIO3wm2iQNaA,2136
 tests/test_redis_client.py,sha256=d9_MLYsJ4ecVil_jPB2gW3Q5aWnavxmmjZg2uYI3LVo,3256
 tests/test_s3queue_config.py,sha256=F05cnD61S2wBKPabcpEJxf55-DJGF4nLqwBb6aFbprc,9741
-moose_lib-0.6.57.dist-info/METADATA,sha256=K56SiYlkK3_a-aPk3R1mNYJFoBr10nmX1UIzgnw32Ts,730
-moose_lib-0.6.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moose_lib-0.6.57.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
-moose_lib-0.6.57.dist-info/RECORD,,
+moose_lib-0.6.58.dist-info/METADATA,sha256=isbeDqTmxePp9Ddt0qIi20malUdk_g-8BCW5V-iAoX4,730
+moose_lib-0.6.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moose_lib-0.6.58.dist-info/top_level.txt,sha256=XEns2-4aCmGp2XjJAeEH9TAUcGONLnSLy6ycT9FSJh8,16
+moose_lib-0.6.58.dist-info/RECORD,,