moose-lib 0.6.7__tar.gz → 0.6.8__tar.gz

{moose_lib-0.6.7 → moose_lib-0.6.8}/PKG-INFO

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

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib/dmv2/__init__.py

@@ -42,8 +42,8 @@ from .ingest_pipeline import (
 )
 
 from .consumption import (
-    EgressConfig,
-    ConsumptionApi,
+    ApiConfig,
+    Api,
     get_moose_base_url,
     set_moose_base_url,
 )
@@ -79,8 +79,8 @@ from .registry import (
     get_stream,
     get_ingest_apis,
     get_ingest_api,
-    get_consumption_apis,
-    get_consumption_api,
+    get_apis,
+    get_api,
     get_sql_resources,
     get_sql_resource,
     get_workflows,
@@ -119,8 +119,8 @@ __all__ = [
     'IngestPipeline',
 
     # Consumption
-    'EgressConfig',
-    'ConsumptionApi',
+    'ApiConfig',
+    'Api',
     'get_moose_base_url',
     'set_moose_base_url',
 
@@ -146,8 +146,8 @@ __all__ = [
     'get_stream',
     'get_ingest_apis',
     'get_ingest_api',
-    'get_consumption_apis',
-    'get_consumption_api',
+    'get_apis',
+    'get_api',
     'get_sql_resources',
     'get_sql_resource',
     'get_workflows',

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib/dmv2/_registry.py

@@ -10,8 +10,8 @@ from typing import Dict, Any
 _tables: Dict[str, Any] = {}
 _streams: Dict[str, Any] = {}
 _ingest_apis: Dict[str, Any] = {}
-_egress_apis: Dict[str, Any] = {}
+_apis: Dict[str, Any] = {}
 # Alias map for O(1) fallback of sole versioned APIs: base name -> handler
-_egress_api_name_aliases: Dict[str, Any] = {}
+_api_name_aliases: Dict[str, Any] = {}
 _sql_resources: Dict[str, Any] = {}
 _workflows: Dict[str, Any] = {} 

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib/dmv2/consumption.py

@@ -1,7 +1,7 @@
 """
-Consumption (Egress) API definitions for Moose Data Model v2 (dmv2).
+API definitions for Moose Data Model v2 (dmv2).
 
-This module provides classes for defining and configuring consumption APIs
+This module provides classes for defining and configuring APIs
 that allow querying data through user-defined functions.
 """
 import os
@@ -12,7 +12,7 @@ from pydantic import BaseModel
 from pydantic.json_schema import JsonSchemaValue
 
 from .types import BaseTypedResource, T, U
-from ._registry import _egress_apis, _egress_api_name_aliases
+from ._registry import _apis, _api_name_aliases
 
 # Global base URL configuration
 _global_base_url: Optional[str] = None
@@ -22,7 +22,7 @@ def _generate_api_key(name: str, version: Optional[str] = None) -> str:
 
 
 def set_moose_base_url(url: str) -> None:
-    """Set the global base URL for consumption API calls.
+    """Set the global base URL for API calls.
     
     Args:
         url: The base URL to use for API calls
@@ -43,40 +43,40 @@ def get_moose_base_url() -> Optional[str]:
     return os.getenv('MOOSE_BASE_URL')
 
 
-class EgressConfig(BaseModel):
-    """Configuration for Consumption (Egress) APIs.
+class ApiConfig(BaseModel):
+    """Configuration for APIs.
 
     Attributes:
         version: Optional version string.
-        metadata: Optional metadata for the consumption API.
+        metadata: Optional metadata for the API.
     """
     version: Optional[str] = None
     metadata: Optional[dict] = None
 
 
-class ConsumptionApi(BaseTypedResource, Generic[U]):
-    """Represents a Consumption (Egress) API endpoint.
+class Api(BaseTypedResource, Generic[U]):
+    """Represents a API endpoint.
 
     Allows querying data, typically powered by a user-defined function.
     Requires two Pydantic models: `T` for query parameters and `U` for the response body.
 
     Args:
-        name: The name of the consumption API endpoint.
+        name: The name of the API endpoint.
         query_function: The callable that executes the query logic.
                       It receives parameters matching model `T` (and potentially
                       other runtime utilities) and should return data matching model `U`.
         config: Optional configuration (currently only `version`).
         t: A tuple containing the input (`T`) and output (`U`) Pydantic models
-           (passed via `ConsumptionApi[InputModel, OutputModel](...)`).
+           (passed via `Api[InputModel, OutputModel](...)`).
 
     Attributes:
-        config (EgressConfig): Configuration for the API.
+        config (ApiConfig): Configuration for the API.
         query_function (Callable[..., U]): The handler function for the API.
         name (str): The name of the API.
         model_type (type[T]): The Pydantic model for the input/query parameters.
         return_type (type[U]): The Pydantic model for the response body.
     """
-    config: EgressConfig
+    config: ApiConfig
     query_function: Callable[..., U]
     _u: type[U]
 
@@ -91,7 +91,7 @@ class ConsumptionApi(BaseTypedResource, Generic[U]):
 
         return curried_constructor
 
-    def __init__(self, name: str, query_function: Callable[..., U], config: EgressConfig = None, version: str = None, **kwargs):
+    def __init__(self, name: str, query_function: Callable[..., U], config: ApiConfig = None, version: str = None, **kwargs):
         super().__init__()
         self._set_type(name, self._get_type(kwargs))
         
@@ -100,7 +100,7 @@ class ConsumptionApi(BaseTypedResource, Generic[U]):
             # 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(
+                self.config = ApiConfig(
                     version=version,
                     metadata=config.metadata
                 )
@@ -109,28 +109,28 @@ class ConsumptionApi(BaseTypedResource, Generic[U]):
                 self.config = config
         elif version is not None:
             # Only version provided, create new config with version
-            self.config = EgressConfig(version=version)
+            self.config = ApiConfig(version=version)
         else:
             # Neither provided, use default config
-            self.config = EgressConfig()
+            self.config = ApiConfig()
             
         self.query_function = query_function
         self.metadata = getattr(self.config, 'metadata', {}) or {}
         key = _generate_api_key(name, self.config.version)
-        _egress_apis[key] = self
+        _apis[key] = self
 
         # Maintain alias for base name:
         # - If explicit unversioned registered, alias -> that
         # - Else, if exactly one versioned exists, alias -> that
         base = name
         if self.config.version is None:
-            _egress_api_name_aliases[base] = self
+            _api_name_aliases[base] = self
             return
 
         # Versioned registration: only adjust alias if no explicit unversioned exists
-        if base in _egress_apis:
+        if base in _apis:
             # Explicit unversioned present, ensure alias points to it
-            _egress_api_name_aliases[base] = _egress_apis[base]
+            _api_name_aliases[base] = _apis[base]
             return
 
         # Determine if there is exactly one versioned API
@@ -138,16 +138,16 @@ class ConsumptionApi(BaseTypedResource, Generic[U]):
         # Early exit on 2 matches to avoid O(n) counting
         match_count = 0
         sole = None
-        for k in _egress_apis.keys():
+        for k in _apis.keys():
             if k.startswith(prefix):
                 match_count += 1
-                sole = _egress_apis[k]
+                sole = _apis[k]
                 if match_count > 1:
                     break
         if match_count == 1 and sole is not None:
-            _egress_api_name_aliases[base] = sole
+            _api_name_aliases[base] = sole
         else:
-            _egress_api_name_aliases.pop(base, None)
+            _api_name_aliases.pop(base, None)
 
     @classmethod
     def _get_type(cls, keyword_args: dict):
@@ -184,7 +184,7 @@ class ConsumptionApi(BaseTypedResource, Generic[U]):
         )
 
     def call(self, params: T, base_url: Optional[str] = None) -> U:
-        """Call the consumption API with the given parameters.
+        """Call the API with the given parameters.
         
         Args:
             params: Parameters matching the input model T
@@ -206,7 +206,7 @@ class ConsumptionApi(BaseTypedResource, Generic[U]):
             )
 
         # Construct the API endpoint URL
-        url = f"{effective_base_url.rstrip('/')}/consumption/{self.name}"
+        url = f"{effective_base_url.rstrip('/')}/api/{self.name}"
 
         # Convert Pydantic model to dictionary
         params_dict = params.model_dump()

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib/dmv2/registry.py

@@ -8,17 +8,17 @@ from typing import Optional, Dict
 from .olap_table import OlapTable
 from .stream import Stream
 from .ingest_api import IngestApi
-from .consumption import ConsumptionApi
+from .consumption import Api
 from .sql_resource import SqlResource
 from .workflow import Workflow
 from ._registry import (
     _tables,
     _streams,
     _ingest_apis,
-    _egress_apis,
+    _apis,
     _sql_resources,
     _workflows,
-    _egress_api_name_aliases,
+    _api_name_aliases,
 )
 
 def get_tables() -> Dict[str, OlapTable]:
@@ -45,16 +45,16 @@ def get_ingest_api(name: str) -> Optional[IngestApi]:
     """Get a registered ingestion API by name."""
     return _ingest_apis.get(name)
 
-def get_consumption_apis() -> Dict[str, ConsumptionApi]:
-    """Get all registered consumption APIs."""
-    return _egress_apis
+def get_apis() -> Dict[str, Api]:
+    """Get all registered APIs."""
+    return _apis
 
-def get_consumption_api(name: str) -> Optional[ConsumptionApi]:
-    """Get a registered consumption API by name.
+def get_api(name: str) -> Optional[Api]:
+    """Get a registered API by name.
 
     Supports unversioned lookup by name via alias map when only a single versioned API exists.
     """
-    return _egress_apis.get(name) or _egress_api_name_aliases.get(name)
+    return _apis.get(name) or _api_name_aliases.get(name)
 
 def get_sql_resources() -> Dict[str, SqlResource]:
     """Get all registered SQL resources."""

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib/internal.py

@@ -15,7 +15,7 @@ from moose_lib.dmv2 import (
     get_tables,
     get_streams,
     get_ingest_apis,
-    get_consumption_apis,
+    get_apis,
     get_sql_resources,
     get_workflows,
     OlapTable,
@@ -126,11 +126,11 @@ class IngestApiConfig(BaseModel):
     version: Optional[str] = None
     metadata: Optional[dict] = None
 
-class EgressApiConfig(BaseModel):
-    """Internal representation of a Consumption (Egress) API configuration for serialization.
+class InternalApiConfig(BaseModel):
+    """Internal representation of a API configuration for serialization.
 
     Attributes:
-        name: Name of the Egress API.
+        name: Name of the API.
         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.
@@ -202,7 +202,7 @@ class InfrastructureMap(BaseModel):
         tables: Dictionary mapping table names to their configurations.
         topics: Dictionary mapping topic/stream names to their configurations.
         ingest_apis: Dictionary mapping ingest API names to their configurations.
-        egress_apis: Dictionary mapping egress API names to their configurations.
+        apis: Dictionary mapping API names to their configurations.
         sql_resources: Dictionary mapping SQL resource names to their configurations.
         workflows: Dictionary mapping workflow names to their configurations.
     """
@@ -211,7 +211,7 @@ class InfrastructureMap(BaseModel):
     tables: dict[str, TableConfig]
     topics: dict[str, TopicConfig]
     ingest_apis: dict[str, IngestApiConfig]
-    egress_apis: dict[str, EgressApiConfig]
+    apis: dict[str, InternalApiConfig]
     sql_resources: dict[str, SqlResourceConfig]
     workflows: dict[str, WorkflowJson]
 
@@ -262,7 +262,7 @@ def to_infra_map() -> dict:
     tables = {}
     topics = {}
     ingest_apis = {}
-    egress_apis = {}
+    apis = {}
     sql_resources = {}
     workflows = {}
 
@@ -323,8 +323,8 @@ def to_infra_map() -> dict:
             dead_letter_queue=api.config.dead_letter_queue.name
         )
 
-    for name, api in get_consumption_apis().items():
-        egress_apis[name] = EgressApiConfig(
+    for name, api in get_apis().items():
+        apis[name] = InternalApiConfig(
             name=api.name,
             query_params=_to_columns(api.model_type),
             response_schema=api.get_response_schema(),
@@ -354,7 +354,7 @@ def to_infra_map() -> dict:
         tables=tables,
         topics=topics,
         ingest_apis=ingest_apis,
-        egress_apis=egress_apis,
+        apis=apis,
         sql_resources=sql_resources,
         workflows=workflows
     )

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib/main.py

@@ -136,7 +136,7 @@ JWTPayload = Dict[str, Any]
 
 
 @dataclass
-class ConsumptionApiResult:
+class ApiResult:
     """Standard structure for returning results from a Consumption API handler.
 
     Attributes:

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib/query_param.py

@@ -118,7 +118,7 @@ def convert_dataclass_definition(cls: type) -> list[QueryField]:
     return fields_list
 
 
-def convert_consumption_api_param(module) -> Optional[tuple[type, list[QueryField]]]:
+def convert_api_param(module) -> Optional[tuple[type, list[QueryField]]]:
     run_func = module.run
     params_arg = inspect.getfullargspec(run_func).args[1]
     param_class: type = run_func.__annotations__.get(params_arg)

{moose_lib-0.6.7 → moose_lib-0.6.8}/moose_lib.egg-info/PKG-INFO

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