moose-lib 0.6.137__tar.gz → 0.6.138__tar.gz

{moose_lib-0.6.137 → moose_lib-0.6.138}/PKG-INFO

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

{moose_lib-0.6.137 → moose_lib-0.6.138}/moose_lib/dmv2/web_app.py

@@ -37,15 +37,15 @@ class WebAppConfig:
     """Configuration for a WebApp.
 
     Attributes:
-        mount_path: The URL path where the WebApp will be mounted.
-                   Defaults to "/" if not specified.
-                   Cannot end with "/" (except for root "/").
+        mount_path: The URL path where the WebApp will be mounted (required).
+                   Cannot be "/" (root path).
+                   Cannot end with "/" (trailing slash).
                    Cannot start with reserved paths.
         metadata: Optional metadata for documentation purposes.
         inject_moose_utils: Whether to inject MooseClient utilities into requests.
                            Defaults to True.
     """
-    mount_path: Optional[str] = None
+    mount_path: str
     metadata: Optional[WebAppMetadata] = None
     inject_moose_utils: bool = True
 
@@ -85,7 +85,7 @@ class WebApp:
     Args:
         name: Unique name for this WebApp.
         app: The FastAPI application instance.
-        config: Optional configuration for the WebApp.
+        config: Configuration for the WebApp (required, must include mount_path).
 
     Raises:
         ValueError: If validation fails (duplicate name, invalid mount path, etc.)
@@ -95,11 +95,11 @@ class WebApp:
         self,
         name: str,
         app: Any,  # FastAPI app, typed as Any to avoid import dependency
-        config: Optional[WebAppConfig] = None,
+        config: WebAppConfig,
     ):
         self.name = name
         self.app = app
-        self.config = config or WebAppConfig()
+        self.config = config
 
         # Import the registry here to avoid circular dependency
         from ._registry import _web_apps
@@ -126,10 +126,23 @@ class WebApp:
         if name in existing_web_apps:
             raise ValueError(f"WebApp with name '{name}' already exists")
 
-        mount_path = config.mount_path or "/"
+        # Validate mountPath - it is required
+        if not config.mount_path:
+            raise ValueError(
+                f"mountPath is required. Please specify a mount path for your WebApp (e.g., \"/myapi\")."
+            )
+
+        mount_path = config.mount_path
+
+        # Check for root path - not allowed as it would overlap reserved paths
+        if mount_path == "/":
+            raise ValueError(
+                f"mountPath cannot be \"/\" as it would allow routes to overlap with reserved paths: "
+                f"{', '.join(RESERVED_MOUNT_PATHS)}"
+            )
 
         # Validate mount path format
-        if mount_path != "/" and mount_path.endswith("/"):
+        if mount_path.endswith("/"):
             raise ValueError(
                 f"mountPath cannot end with a trailing slash. "
                 f"Remove the '/' from: \"{mount_path}\""
@@ -146,7 +159,7 @@ class WebApp:
 
         # Check for duplicate mount path
         for existing_name, existing_app in existing_web_apps.items():
-            existing_mount = existing_app.config.mount_path or "/"
+            existing_mount = existing_app.config.mount_path
             if existing_mount == mount_path:
                 raise ValueError(
                     f"WebApp with mountPath \"{mount_path}\" already exists "
@@ -154,5 +167,4 @@ class WebApp:
                 )
 
     def __repr__(self) -> str:
-        mount = self.config.mount_path or "/"
-        return f"WebApp(name='{self.name}', mount_path='{mount}')"
+        return f"WebApp(name='{self.name}', mount_path='{self.config.mount_path}')"

{moose_lib-0.6.137 → moose_lib-0.6.138}/moose_lib.egg-info/PKG-INFO

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

{moose_lib-0.6.137 → moose_lib-0.6.138}/tests/test_web_app.py

@@ -21,13 +21,14 @@ def clear_registry():
 
 
 def test_webapp_basic_creation():
-    """Test basic WebApp creation with default config."""
+    """Test basic WebApp creation with required mount_path."""
     app = MockFastAPIApp()
-    webapp = WebApp("test_app", app)
+    config = WebAppConfig(mount_path="/test")
+    webapp = WebApp("test_app", app, config)
 
     assert webapp.name == "test_app"
     assert webapp.app is app
-    assert webapp.config.mount_path is None
+    assert webapp.config.mount_path == "/test"
     assert webapp.config.inject_moose_utils is True
     assert "test_app" in _web_apps
 
@@ -63,10 +64,10 @@ def test_webapp_duplicate_name():
     app1 = MockFastAPIApp()
     app2 = MockFastAPIApp()
 
-    WebApp("test_app", app1)
+    WebApp("test_app", app1, WebAppConfig(mount_path="/test1"))
 
     with pytest.raises(ValueError, match="WebApp with name 'test_app' already exists"):
-        WebApp("test_app", app2)
+        WebApp("test_app", app2, WebAppConfig(mount_path="/test2"))
 
 
 def test_webapp_trailing_slash_validation():
@@ -78,13 +79,13 @@ def test_webapp_trailing_slash_validation():
         WebApp("test_app", app, config)
 
 
-def test_webapp_root_path_allowed():
-    """Test that root path '/' is allowed."""
+def test_webapp_root_path_rejected():
+    """Test that root path '/' is rejected to prevent overlap with reserved paths."""
     app = MockFastAPIApp()
     config = WebAppConfig(mount_path="/")
-    webapp = WebApp("test_app", app, config)
 
-    assert webapp.config.mount_path == "/"
+    with pytest.raises(ValueError, match='mountPath cannot be "/" as it would allow routes to overlap with reserved paths'):
+        WebApp("test_app", app, config)
 
 
 def test_webapp_reserved_paths():
@@ -144,7 +145,7 @@ def test_webapp_different_mount_paths():
 def test_webapp_inject_moose_utils_false():
     """Test WebApp with inject_moose_utils disabled."""
     app = MockFastAPIApp()
-    config = WebAppConfig(inject_moose_utils=False)
+    config = WebAppConfig(mount_path="/test", inject_moose_utils=False)
     webapp = WebApp("test_app", app, config)
 
     assert webapp.config.inject_moose_utils is False
@@ -159,13 +160,12 @@ def test_webapp_repr():
     assert "/myapi" in repr(webapp)
 
 
-def test_webapp_default_mount_path_in_repr():
-    """Test WebApp repr with default mount path."""
+def test_webapp_mount_path_required():
+    """Test that mount_path is required."""
     app = MockFastAPIApp()
-    webapp = WebApp("test_app", app)
 
-    assert "test_app" in repr(webapp)
-    assert "/" in repr(webapp)
+    with pytest.raises(ValueError, match="mountPath is required"):
+        WebApp("test_app", app, WebAppConfig(mount_path=""))
 
 
 def test_webapp_serialization():
@@ -197,16 +197,16 @@ def test_webapp_serialization():
     assert infra_map["webApps"]["test_app"]["metadata"]["description"] == "Test API"
 
 
-def test_webapp_serialization_default_mount_path():
-    """Test WebApp serialization with default mount path."""
+def test_webapp_serialization_with_mount_path():
+    """Test WebApp serialization with explicit mount path."""
     from moose_lib.internal import to_infra_map
 
     app = MockFastAPIApp()
-    WebApp("test_app", app)
+    WebApp("test_app", app, WebAppConfig(mount_path="/testpath"))
 
     infra_map = to_infra_map()
 
-    assert infra_map["webApps"]["test_app"]["mountPath"] == "/"
+    assert infra_map["webApps"]["test_app"]["mountPath"] == "/testpath"
 
 
 def test_webapp_serialization_no_metadata():