fleet-python 0.2.69b2__py3-none-any.whl → 0.2.69b3__py3-none-any.whl

fleet/client.py

@@ -22,6 +22,7 @@ import json
 import logging
 import os
 from typing import List, Optional, Dict, Any, TYPE_CHECKING, Union
+from urllib.parse import urlparse
 
 from .base import EnvironmentBase, SyncWrapper
 from .models import (
@@ -74,6 +75,14 @@ class SyncEnv(EnvironmentBase):
         self._client = client
         self._apps: Dict[str, InstanceClient] = {}
         self._instance: Optional[InstanceClient] = None
+        self._manager_url_override: Optional[str] = None  # For URL mode
+
+    @property
+    def manager_url(self) -> str:
+        """Override to support URL mode where urls is None."""
+        if self._manager_url_override is not None:
+            return self._manager_url_override
+        return super().manager_url
 
     @property
     def instance(self) -> InstanceClient:
@@ -85,17 +94,17 @@ class SyncEnv(EnvironmentBase):
 
     def app(self, name: str) -> InstanceClient:
         if name not in self._apps:
-            # Extract base URL by removing the current app path (e.g., /sentry/api/v1/env)
-            # manager_url looks like: https://xxx.fleetai.com/sentry/api/v1/env
-            base_url = self.manager_url.split("/api/v1/env")[0]
-            # Remove the current app name (e.g., /sentry) to get the root
-            if "/" in base_url:
-                parts = base_url.rsplit("/", 1)
-                if len(parts) == 2 and parts[0] != "https:/":
-                    base_url = parts[0]
+            # Extract scheme://netloc from manager_url, then construct /{name}/api/v1/env
+            # Supports all URL formats:
+            #   https://host/api/v1/env -> https://host/{name}/api/v1/env
+            #   https://host/sentry/api/v1/env -> https://host/{name}/api/v1/env
+            #   http://localhost:8080/api/v1/env -> http://localhost:8080/{name}/api/v1/env
+            parsed = urlparse(self.manager_url)
+            root = f"{parsed.scheme}://{parsed.netloc}"
+            new_url = f"{root}/{name}/api/v1/env"
 
             self._apps[name] = InstanceClient(
-                f"{base_url}/{name}/api/v1/env",
+                new_url,
                 self._client.httpx_client if self._client else None,
             )
         return self._apps[name]
@@ -353,6 +362,7 @@ class Fleet:
             health=None,
         )
         env._instance = instance_client
+        env._manager_url_override = base_url  # Set manager_url for URL mode
         return env
 
     @staticmethod
@@ -448,6 +458,7 @@ class Fleet:
             health=None,
         )
         env._instance = instance_client
+        env._manager_url_override = "local://"  # Set manager_url for local mode
         return env
 
     def check_bundle_exists(self, bundle_hash: str) -> VerifiersCheckResponse:

{fleet_python-0.2.69b2.dist-info → fleet_python-0.2.69b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.69b2
+Version: 0.2.69b3
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0

{fleet_python-0.2.69b2.dist-info → fleet_python-0.2.69b3.dist-info}/RECORD

@@ -23,7 +23,7 @@ examples/quickstart.py,sha256=1VT39IRRhemsJgxi0O0gprdpcw7HB4pYO97GAYagIcg,3788
 examples/test_cdp_logging.py,sha256=AkCwQCgOTQEI8w3v0knWK_4eXMph7L9x07wj9yIYM10,2836
 fleet/__init__.py,sha256=yC4HIcbtPAPOgI0lLri3l8nbXkNee9JOihKAc7SXYkY,4201
 fleet/base.py,sha256=bc-340sTpq_DJs7yQ9d2pDWnmJFmA1SwDB9Lagvqtb4,9182
-fleet/client.py,sha256=HPBKsGeWuLoBXFmEdZuLz04aYDKmg0_eYSgQ2-O4tNg,39521
+fleet/client.py,sha256=lNVbAzq23p6-x66YduSdm4ZZC8yJreM82QVIKvDknuQ,40046
 fleet/config.py,sha256=uY02ZKxVoXqVDta-0IMWaYJeE1CTXF_fA9NI6QUutmU,319
 fleet/exceptions.py,sha256=fUmPwWhnT8SR97lYsRq0kLHQHKtSh2eJS0VQ2caSzEI,5055
 fleet/global_client.py,sha256=frrDAFNM2ywN0JHLtlm9qbE1dQpnQJsavJpb7xSR_bU,1072
@@ -69,15 +69,16 @@ fleet/verifiers/decorator.py,sha256=nAP3O8szXu7md_kpwpz91hGSUNEVLYjwZQZTkQlV1DM,
 fleet/verifiers/parse.py,sha256=qz9AfJrTbjlg-LU-lE8Ciqi7Yt2a8-cs17FdpjTLhMk,8550
 fleet/verifiers/sql_differ.py,sha256=TqTLWyK3uOyLbitT6HYzYEzuSFC39wcyhgk3rcm__k8,6525
 fleet/verifiers/verifier.py,sha256=_lcxXVm8e0xRrK2gNJy9up7pW1zOkPRY5n5lQ85S8jg,14197
-fleet_python-0.2.69b2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fleet_python-0.2.69b3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 scripts/fix_sync_imports.py,sha256=X9fWLTpiPGkSHsjyQUDepOJkxOqw1DPj7nd8wFlFqLQ,8368
 scripts/unasync.py,sha256=vWVQxRWX8SRZO5cmzEhpvnG_REhCWXpidIGIpWmEcvI,696
 tests/__init__.py,sha256=Re1SdyxH8NfyL1kjhi7SQkGP1mYeWB-D6UALqdIMd8I,35
+tests/test_app_method.py,sha256=kg2IiL75cH-HmsTMS3_wDL39dAesgfv_AT6jVthd5J4,3159
 tests/test_instance_dispatch.py,sha256=CvU4C3LBIqsYZdEsEFfontGjyxAZfVYyXnGwxyIvXOc,23065
 tests/test_sqlite_resource_dual_mode.py,sha256=Mh8jBd-xsIGDYFsOACKKK_5DXMUYlFFS7W-jaY6AjG4,8734
 tests/test_sqlite_shared_memory_behavior.py,sha256=fKx_1BmLS3b8x-9pMgjMycpnaHWY8P-2ZuXEspx6Sbw,4082
 tests/test_verifier_from_string.py,sha256=Lxi3TpFHFb-hG4-UhLKZJkqo84ax9YJY8G6beO-1erM,13581
-fleet_python-0.2.69b2.dist-info/METADATA,sha256=uUc9gJCTRFAIXetYKsETKq-P62QdGF35_wjxDjSYMcw,3306
-fleet_python-0.2.69b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fleet_python-0.2.69b2.dist-info/top_level.txt,sha256=qb1zIbtEktyhRFZdqVytwg54l64qtoZL0wjHB4bUg3c,29
-fleet_python-0.2.69b2.dist-info/RECORD,,
+fleet_python-0.2.69b3.dist-info/METADATA,sha256=M4OF4x_-pFl_h9xAh7ERomXkssTvlrH5HxDPq-C75Ng,3306
+fleet_python-0.2.69b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fleet_python-0.2.69b3.dist-info/top_level.txt,sha256=qb1zIbtEktyhRFZdqVytwg54l64qtoZL0wjHB4bUg3c,29
+fleet_python-0.2.69b3.dist-info/RECORD,,

tests/test_app_method.py

@@ -0,0 +1,85 @@
+"""Unit tests for SyncEnv.app() method URL handling."""
+
+import pytest
+from unittest.mock import Mock, patch
+from fleet.client import Fleet
+
+
+class TestAppMethod:
+    """Test SyncEnv.app() method with different URL formats."""
+
+    @pytest.fixture
+    def fleet_client(self):
+        """Create a Fleet client with mocked HTTP client."""
+        with patch("fleet.client.default_httpx_client") as mock_client:
+            mock_client.return_value = Mock()
+            client = Fleet(api_key="test_key")
+            client.client.request = Mock()
+            return client
+
+    def test_app_with_existing_app_path(self, fleet_client):
+        """Test app() with URL that already has an app path like /sentry."""
+        # Create instance with a URL that has an existing app path
+        env = fleet_client.instance("https://example.com/sentry/api/v1/env")
+
+        # Access jira app
+        jira_client = env.app("jira")
+
+        # Check the constructed URL
+        assert jira_client.base_url == "https://example.com/jira/api/v1/env", \
+            f"Expected https://example.com/jira/api/v1/env, got {jira_client.base_url}"
+
+    def test_app_without_app_path(self, fleet_client):
+        """Test app() with URL that has no app path (just /api/v1/env)."""
+        # Create instance with a URL without an app path
+        env = fleet_client.instance("https://example.com/api/v1/env")
+
+        # Access jira app
+        jira_client = env.app("jira")
+
+        # Check the constructed URL
+        assert jira_client.base_url == "https://example.com/jira/api/v1/env", \
+            f"Expected https://example.com/jira/api/v1/env, got {jira_client.base_url}"
+
+    def test_app_with_different_app_names(self, fleet_client):
+        """Test app() with multiple different app names."""
+        env = fleet_client.instance("https://example.com/api/v1/env")
+
+        jira = env.app("jira")
+        sentry = env.app("sentry")
+        github = env.app("github")
+
+        assert jira.base_url == "https://example.com/jira/api/v1/env"
+        assert sentry.base_url == "https://example.com/sentry/api/v1/env"
+        assert github.base_url == "https://example.com/github/api/v1/env"
+
+    def test_app_caching(self, fleet_client):
+        """Test that app() caches InstanceClient instances."""
+        env = fleet_client.instance("https://example.com/api/v1/env")
+
+        # Call app("jira") twice
+        jira1 = env.app("jira")
+        jira2 = env.app("jira")
+
+        # Should return the same cached instance
+        assert jira1 is jira2
+
+    def test_app_with_localhost(self, fleet_client):
+        """Test app() with localhost URLs."""
+        env = fleet_client.instance("http://localhost:8080/api/v1/env")
+
+        jira = env.app("jira")
+
+        assert jira.base_url == "http://localhost:8080/jira/api/v1/env"
+
+    def test_app_with_port(self, fleet_client):
+        """Test app() with URLs that include port numbers."""
+        env = fleet_client.instance("https://example.com:9000/api/v1/env")
+
+        jira = env.app("jira")
+
+        assert jira.base_url == "https://example.com:9000/jira/api/v1/env"
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])