fleet-python 0.2.38__py3-none-any.whl → 0.2.40__py3-none-any.whl

fleet/_async/client.py

@@ -44,7 +44,12 @@ from .instance import (
     ResetResponse,
     ExecuteFunctionResponse,
 )
-from ..config import DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT, REGION_BASE_URL
+from ..config import (
+    DEFAULT_MAX_RETRIES,
+    DEFAULT_TIMEOUT,
+    REGION_BASE_URL,
+    GLOBAL_BASE_URL,
+)
 from .instance.base import default_httpx_client
 from .instance.client import ValidatorType
 from .resources.base import Resource
@@ -196,7 +201,12 @@ class AsyncFleet:
         response = await self.client.request("GET", f"/v1/env/{env_key}")
         return EnvironmentModel(**response.json())
 
-    async def make(self, env_key: str, region: Optional[str] = None, env_variables: Optional[Dict[str, Any]] = None) -> AsyncEnv:
+    async def make(
+        self,
+        env_key: str,
+        region: Optional[str] = None,
+        env_variables: Optional[Dict[str, Any]] = None,
+    ) -> AsyncEnv:
         if ":" in env_key:
             env_key_part, version = env_key.split(":", 1)
             if (
@@ -210,14 +220,23 @@ class AsyncFleet:
             version = None
 
         request = InstanceRequest(
-            env_key=env_key_part, version=version, region=region, env_variables=env_variables, created_from="sdk"
+            env_key=env_key_part,
+            version=version,
+            region=region,
+            env_variables=env_variables,
+            created_from="sdk",
         )
-        region_base_url = REGION_BASE_URL.get(region)
+
+        # Only use region-specific base URL if no custom base URL is set
+        base_url = None
+        if region and self.client.base_url == GLOBAL_BASE_URL:
+            base_url = REGION_BASE_URL.get(region)
+
         response = await self.client.request(
             "POST",
             "/v1/env/instances",
             json=request.model_dump(exclude_none=True),
-            base_url=region_base_url,
+            base_url=base_url,
         )
 
         instance = AsyncEnv(client=self.client, **response.json())
@@ -308,11 +327,11 @@ class AsyncFleet:
         return task
 
     async def load_tasks(
-        self, 
+        self,
         env_key: Optional[str] = None,
         keys: Optional[List[str]] = None,
         version: Optional[str] = None,
-        team_id: Optional[str] = None
+        team_id: Optional[str] = None,
     ) -> List[Task]:
         """Load tasks for the authenticated team, with optional filtering.
 
@@ -498,7 +517,7 @@ class AsyncFleet:
         """
         from ..tasks import verifier_from_string
         from .verifiers.verifier import AsyncVerifierFunction
-        
+
         # Use verifier_from_string to create the verifier
         verifier_func = verifier_from_string(
             verifier_func=verifier_code,
@@ -506,7 +525,7 @@ class AsyncFleet:
             verifier_key=verifier_key,
             sha256=verifier_sha,
         )
-        
+
         # Store the original verifier code for reference
         verifier_func._verifier_code = verifier_code
 

fleet/_async/tasks.py

@@ -36,11 +36,6 @@ class Task(BaseModel):
 
     @validator("key")
     def validate_key_format(cls, v):
-        """Validate key follows kebab-case format."""
-        if not re.match(r"^[a-z0-9]+(-[a-z0-9]+)*$", v):
-            raise ValueError(
-                f"Invalid task key format: {v}. Must follow kebab-case format."
-            )
         return v
 
     @validator("created_at", pre=True, always=True)

fleet/client.py

@@ -44,7 +44,12 @@ from .instance import (
     ResetResponse,
     ExecuteFunctionResponse,
 )
-from .config import DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT, REGION_BASE_URL
+from .config import (
+    DEFAULT_MAX_RETRIES,
+    DEFAULT_TIMEOUT,
+    REGION_BASE_URL,
+    GLOBAL_BASE_URL,
+)
 from .instance.base import default_httpx_client
 from .instance.client import ValidatorType
 from .resources.base import Resource
@@ -196,7 +201,12 @@ class Fleet:
         response = self.client.request("GET", f"/v1/env/{env_key}")
         return EnvironmentModel(**response.json())
 
-    def make(self, env_key: str, region: Optional[str] = None, env_variables: Optional[Dict[str, Any]] = None) -> SyncEnv:
+    def make(
+        self,
+        env_key: str,
+        region: Optional[str] = None,
+        env_variables: Optional[Dict[str, Any]] = None,
+    ) -> SyncEnv:
         if ":" in env_key:
             env_key_part, version = env_key.split(":", 1)
             if (
@@ -210,14 +220,23 @@ class Fleet:
             version = None
 
         request = InstanceRequest(
-            env_key=env_key_part, version=version, region=region, env_variables=env_variables, created_from="sdk"
+            env_key=env_key_part,
+            version=version,
+            region=region,
+            env_variables=env_variables,
+            created_from="sdk",
         )
-        region_base_url = REGION_BASE_URL.get(region)
+
+        # Only use region-specific base URL if no custom base URL is set
+        base_url = None
+        if region and self.client.base_url == GLOBAL_BASE_URL:
+            base_url = REGION_BASE_URL.get(region)
+
         response = self.client.request(
             "POST",
             "/v1/env/instances",
             json=request.model_dump(exclude_none=True),
-            base_url=region_base_url,
+            base_url=base_url,
         )
 
         instance = SyncEnv(client=self.client, **response.json())
@@ -254,9 +273,7 @@ class Fleet:
     def execute_verifier_remote(
         self, bundle_data: bytes, args: tuple, kwargs: dict, timeout: Optional[int] = 30
     ) -> VerifiersExecuteResponse:
-        return _execute_verifier_remote(
-            self.client, bundle_data, args, kwargs, timeout
-        )
+        return _execute_verifier_remote(self.client, bundle_data, args, kwargs, timeout)
 
     def delete(self, instance_id: str) -> InstanceResponse:
         return _delete_instance(self.client, instance_id)
@@ -267,9 +284,7 @@ class Fleet:
 
         return self.load_task_array_from_string(tasks_data)
 
-    def load_task_array_from_string(
-        self, serialized_tasks: List[Dict]
-    ) -> List[Task]:
+    def load_task_array_from_string(self, serialized_tasks: List[Dict]) -> List[Task]:
         tasks = []
 
         json_tasks = json.loads(serialized_tasks)
@@ -308,11 +323,11 @@ class Fleet:
         return task
 
     def load_tasks(
-        self, 
+        self,
         env_key: Optional[str] = None,
         keys: Optional[List[str]] = None,
         version: Optional[str] = None,
-        team_id: Optional[str] = None
+        team_id: Optional[str] = None,
     ) -> List[Task]:
         """Load tasks for the authenticated team, with optional filtering.
 
@@ -498,7 +513,7 @@ class Fleet:
         """
         from .tasks import verifier_from_string
         from .verifiers import SyncVerifierFunction
-        
+
         # Use verifier_from_string to create the verifier
         verifier_func = verifier_from_string(
             verifier_func=verifier_code,
@@ -506,7 +521,7 @@ class Fleet:
             verifier_key=verifier_key,
             sha256=verifier_sha,
         )
-        
+
         # Store the original verifier code for reference
         verifier_func._verifier_code = verifier_code
 

fleet/tasks.py

@@ -37,11 +37,6 @@ class Task(BaseModel):
 
     @validator("key")
     def validate_key_format(cls, v):
-        """Validate key follows kebab-case format."""
-        if not re.match(r"^[a-z0-9]+(-[a-z0-9]+)*$", v):
-            raise ValueError(
-                f"Invalid task key format: {v}. Must follow kebab-case format."
-            )
         return v
 
     @validator("created_at", pre=True, always=True)

{fleet_python-0.2.38.dist-info → fleet_python-0.2.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.38
+Version: 0.2.40
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0
@@ -12,12 +12,11 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.0

{fleet_python-0.2.38.dist-info → fleet_python-0.2.40.dist-info}/RECORD

@@ -21,20 +21,20 @@ examples/quickstart.py,sha256=1VT39IRRhemsJgxi0O0gprdpcw7HB4pYO97GAYagIcg,3788
 examples/test_cdp_logging.py,sha256=AkCwQCgOTQEI8w3v0knWK_4eXMph7L9x07wj9yIYM10,2836
 fleet/__init__.py,sha256=F6PrtihwOKZxmaOkeHmGLBM3feTpRTEDT5tSqeSD7ts,3749
 fleet/base.py,sha256=bc-340sTpq_DJs7yQ9d2pDWnmJFmA1SwDB9Lagvqtb4,9182
-fleet/client.py,sha256=nxYynq06wa7pWeMzPvwgAC6XBrb9rzujQfPi2hl_gmM,21876
+fleet/client.py,sha256=OKc68xmt819OxBQ-RfNslfDTHJtX0pPLxdGVdH1WAh8,22102
 fleet/config.py,sha256=uY02ZKxVoXqVDta-0IMWaYJeE1CTXF_fA9NI6QUutmU,319
 fleet/exceptions.py,sha256=fUmPwWhnT8SR97lYsRq0kLHQHKtSh2eJS0VQ2caSzEI,5055
 fleet/global_client.py,sha256=frrDAFNM2ywN0JHLtlm9qbE1dQpnQJsavJpb7xSR_bU,1072
 fleet/models.py,sha256=9tDjgcgKPMnf-R_MDh-Ocp_UMbyJ8tJyjb15XqU0N94,12454
-fleet/tasks.py,sha256=PcqwRktjR7o7surwWCgDScFp6PMl2YguJSs8VgZYs0g,8968
+fleet/tasks.py,sha256=9ass6zLyuMKC_2gTphZClhVR9RdJml-yeH_GbCu6WOE,8733
 fleet/types.py,sha256=L4Y82xICf1tzyCLqhLYUgEoaIIS5h9T05TyFNHSWs3s,652
 fleet/_async/__init__.py,sha256=lrnDD6N9p0Oqpi_djxTnxh8I5F7nA7KNn0khciGmgpg,6747
 fleet/_async/base.py,sha256=oisVTQsx0M_yTmyQJc3oij63uKZ97MHz-xYFsWXxQE8,9202
-fleet/_async/client.py,sha256=WNaBwHJWRrOyYB79_qujdKkRMPmhpSucHbfTic9uc6A,22335
+fleet/_async/client.py,sha256=fTzc5wtPntihAdydE_g-XIJYojcrfDvvmcOJUgR557k,22597
 fleet/_async/exceptions.py,sha256=fUmPwWhnT8SR97lYsRq0kLHQHKtSh2eJS0VQ2caSzEI,5055
 fleet/_async/global_client.py,sha256=4WskpLHbsDEgWW7hXMD09W-brkp4euy8w2ZJ88594rQ,1103
 fleet/_async/models.py,sha256=9tDjgcgKPMnf-R_MDh-Ocp_UMbyJ8tJyjb15XqU0N94,12454
-fleet/_async/tasks.py,sha256=pY01ImjiX0CPWfTy0HcOUjLSeqzItigOhWUAAAiSj6M,7685
+fleet/_async/tasks.py,sha256=M1jueEdqzr_q02YrOKgjNLf3C1wRWK5rsPp0bcoxkME,7450
 fleet/_async/env/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fleet/_async/env/client.py,sha256=9GOSkEWNncwTtiZNaJ2vNGrFCPutyan9lBNhD87dAzQ,1059
 fleet/_async/instance/__init__.py,sha256=PtmJq8J8bh0SOQ2V55QURz5GJfobozwtQoqhaOk3_tI,515
@@ -67,10 +67,10 @@ fleet/verifiers/decorator.py,sha256=nAP3O8szXu7md_kpwpz91hGSUNEVLYjwZQZTkQlV1DM,
 fleet/verifiers/parse.py,sha256=0bAbj9VvT__yU4ZVREUK-Tn9dukh9LCpmfVsgj1DfP4,8508
 fleet/verifiers/sql_differ.py,sha256=dmiGCFXVMEMbAX519OjhVqgA8ZvhnvdmC1BVpL7QCF0,6490
 fleet/verifiers/verifier.py,sha256=53oBWAf0yy3bZmZx9eH9AWIf65H7OP2UUm0YwWCL6Mc,14286
-fleet_python-0.2.38.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fleet_python-0.2.40.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 scripts/fix_sync_imports.py,sha256=X9fWLTpiPGkSHsjyQUDepOJkxOqw1DPj7nd8wFlFqLQ,8368
 scripts/unasync.py,sha256=vWVQxRWX8SRZO5cmzEhpvnG_REhCWXpidIGIpWmEcvI,696
-fleet_python-0.2.38.dist-info/METADATA,sha256=72nH4_f7klXmhxV8TGFNHBSejrFWJFxMJHoYq75RhBc,3354
-fleet_python-0.2.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fleet_python-0.2.38.dist-info/top_level.txt,sha256=_3DSmTohvSDf3AIP_BYfGzhwO1ECFwuzg83X-wHCx3Y,23
-fleet_python-0.2.38.dist-info/RECORD,,
+fleet_python-0.2.40.dist-info/METADATA,sha256=tuvpRVps6DXkdHBYmMvJ8UXhX15_X1-Fm847DQZ-fdY,3304
+fleet_python-0.2.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fleet_python-0.2.40.dist-info/top_level.txt,sha256=_3DSmTohvSDf3AIP_BYfGzhwO1ECFwuzg83X-wHCx3Y,23
+fleet_python-0.2.40.dist-info/RECORD,,