fleet-python 0.2.60__tar.gz → 0.2.61__tar.gz

{fleet_python-0.2.60 → fleet_python-0.2.61}/PKG-INFO

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

{fleet_python-0.2.60 → fleet_python-0.2.61}/examples/export_tasks.py

@@ -21,6 +21,12 @@ def main():
         help="Optional list of task keys to export (space-separated)",
         default=None,
     )
+    parser.add_argument(
+        "--task-project-key",
+        "-tpk",
+        help="Optional task project key to filter tasks",
+        default=None,
+    )
     parser.add_argument(
         "--output",
         "-o",
@@ -31,9 +37,17 @@ def main():
     args = parser.parse_args()
 
     # Validate that only one filter is specified
-    if args.project_key and args.task_keys:
+    filters_specified = sum(
+        [
+            args.project_key is not None,
+            args.task_keys is not None,
+            args.task_project_key is not None,
+        ]
+    )
+
+    if filters_specified > 1:
         parser.error(
-            "Cannot specify both --project-key and --task-keys. Use one or neither."
+            "Cannot specify multiple filters. Use only one of --project-key, --task-keys, or --task-project-key."
         )
 
     # Get account info
@@ -49,6 +63,9 @@ def main():
             f"Loading {len(args.task_keys)} specific task(s): {', '.join(args.task_keys)}"
         )
         tasks = fleet.load_tasks(keys=args.task_keys)
+    elif args.task_project_key:
+        print(f"Loading tasks from task project: {args.task_project_key}")
+        tasks = fleet.load_tasks(task_project_key=args.task_project_key)
     else:
         print("Loading all tasks")
         tasks = fleet.load_tasks()

{fleet_python-0.2.60 → fleet_python-0.2.61}/fleet/_async/client.py

@@ -397,6 +397,7 @@ class AsyncFleet:
             verifier_id=verifier_id,  # Set verifier_id so _rebuild_verifier works
             verifier_sha=verifier_sha,  # Set verifier_sha
             metadata=task_json.get("metadata", {}),  # Default empty metadata
+            output_json_schema=task_json.get("output_json_schema"),  # JSON schema for output
         )
         return task
 
@@ -407,6 +408,7 @@ class AsyncFleet:
         version: Optional[str] = None,
         team_id: Optional[str] = None,
         project_key: Optional[str] = None,
+        task_project_key: Optional[str] = None,
         data_id: Optional[str] = None,
         data_version: Optional[str] = None,
     ) -> List[Task]:
@@ -418,6 +420,7 @@ class AsyncFleet:
             version: Optional version to filter tasks by (client-side filter)
             team_id: Optional team_id to filter by (admin only)
             project_key: Optional project key to filter tasks by
+            task_project_key: Optional task project key to filter tasks by
             data_id: Optional data identifier to filter tasks by
             data_version: Optional data version to filter tasks by
 
@@ -433,6 +436,8 @@ class AsyncFleet:
             params["team_id"] = team_id
         if project_key is not None:
             params["project_key"] = project_key
+        if task_project_key is not None:
+            params["task_project_key"] = task_project_key
         if data_id is not None:
             params["data_id"] = data_id
         if data_version is not None:
@@ -547,6 +552,7 @@ class AsyncFleet:
                 verifier_func=verifier_func,  # Set verifier code
                 verifier=verifier,  # Use created verifier or None
                 metadata={},  # Default empty metadata
+                output_json_schema=getattr(task_response, "output_json_schema", None),  # Get output_json_schema if available
             )
             tasks.append(task)
 

{fleet_python-0.2.60/fleet → fleet_python-0.2.61/fleet/_async}/models.py

@@ -55,9 +55,7 @@ class Instance(BaseModel):
 
 class InstanceRequest(BaseModel):
     env_key: str = Field(..., title="Env Key")
-    env_version: Optional[str] = Field(None, title="Env Version")
-    data_key: Optional[str] = Field(None, title="Data Key")
-    data_version: Optional[str] = Field(None, title="Data Version")
+    version: Optional[str] = Field(None, title="Version")
     region: Optional[str] = Field("us-west-1", title="Region")
     seed: Optional[int] = Field(None, title="Seed")
     timestamp: Optional[int] = Field(None, title="Timestamp")
@@ -67,7 +65,6 @@ class InstanceRequest(BaseModel):
     task_id: Optional[str] = Field(None, title="Task Id")
     force_pull: Optional[bool] = Field(None, title="Force Pull")
     env_variables: Optional[Dict[str, Any]] = Field(None, title="Env Variables")
-    image_type: Optional[str] = Field(None, title="Image Type")
     created_from: Optional[str] = Field(None, title="Created From")
 
 
@@ -157,6 +154,7 @@ class TaskRequest(BaseModel):
     verifier_id: Optional[str] = Field(None, title="Verifier Id")
     version: Optional[str] = Field(None, title="Version")
     env_variables: Optional[Dict[str, Any]] = Field(None, title="Env Variables")
+    output_json_schema: Optional[Dict[str, Any]] = Field(None, title="Output Json Schema")
 
 
 class TaskUpdateRequest(BaseModel):
@@ -183,8 +181,11 @@ class TaskResponse(BaseModel):
     verifier_id: Optional[str] = Field(None, title="Verifier Id")
     verifier_func: Optional[str] = Field(None, title="Verifier Func")
     version: Optional[str] = Field(None, title="Version")
+    data_id: Optional[str] = Field(None, title="Data Id")
+    data_version: Optional[str] = Field(None, title="Data Version")
     env_variables: Optional[Dict[str, Any]] = Field(None, title="Env Variables")
     verifier: Optional[VerifierData] = Field(None, title="Verifier")
+    output_json_schema: Optional[Dict[str, Any]] = Field(None, title="Output Json Schema")
 
 
 class ValidationError(BaseModel):

{fleet_python-0.2.60 → fleet_python-0.2.61}/fleet/_async/tasks.py

@@ -38,6 +38,9 @@ class Task(BaseModel):
     metadata: Optional[Dict[str, Any]] = Field(
         default_factory=dict, description="Additional task metadata"
     )
+    output_json_schema: Optional[Dict[str, Any]] = Field(
+        None, description="JSON schema for expected output format"
+    )
 
     @validator("key")
     def validate_key_format(cls, v):
@@ -329,6 +332,7 @@ async def load_tasks(
     version: Optional[str] = None,
     team_id: Optional[str] = None,
     project_key: Optional[str] = None,
+    task_project_key: Optional[str] = None,
     data_id: Optional[str] = None,
     data_version: Optional[str] = None,
 ) -> List[Task]:
@@ -340,6 +344,7 @@ async def load_tasks(
         version: Optional version to filter tasks by
         team_id: Optional team_id to filter by (admin only)
         project_key: Optional project key to filter tasks by
+        task_project_key: Optional task project key to filter tasks by
         data_id: Optional data identifier to filter tasks by
         data_version: Optional data version to filter tasks by
 
@@ -359,6 +364,7 @@ async def load_tasks(
         version=version,
         team_id=team_id,
         project_key=project_key,
+        task_project_key=task_project_key,
         data_id=data_id,
         data_version=data_version,
     )

{fleet_python-0.2.60 → fleet_python-0.2.61}/fleet/client.py

@@ -395,6 +395,7 @@ class Fleet:
             verifier_id=verifier_id,  # Set verifier_id so _rebuild_verifier works
             verifier_sha=verifier_sha,  # Set verifier_sha
             metadata=task_json.get("metadata", {}),  # Default empty metadata
+            output_json_schema=task_json.get("output_json_schema"),  # JSON schema for output
         )
         return task
 
@@ -405,6 +406,7 @@ class Fleet:
         version: Optional[str] = None,
         team_id: Optional[str] = None,
         project_key: Optional[str] = None,
+        task_project_key: Optional[str] = None,
         data_id: Optional[str] = None,
         data_version: Optional[str] = None,
     ) -> List[Task]:
@@ -416,6 +418,7 @@ class Fleet:
             version: Optional version to filter tasks by (client-side filter)
             team_id: Optional team_id to filter by (admin only)
             project_key: Optional project key to filter tasks by
+            task_project_key: Optional task project key to filter tasks by
             data_id: Optional data identifier to filter tasks by
             data_version: Optional data version to filter tasks by
 
@@ -431,6 +434,8 @@ class Fleet:
             params["team_id"] = team_id
         if project_key is not None:
             params["project_key"] = project_key
+        if task_project_key is not None:
+            params["task_project_key"] = task_project_key
         if data_id is not None:
             params["data_id"] = data_id
         if data_version is not None:
@@ -553,6 +558,7 @@ class Fleet:
                 verifier_func=verifier_func,  # Set verifier code
                 verifier=verifier,  # Use created verifier or None
                 metadata={},  # Default empty metadata
+                output_json_schema=getattr(task_response, "output_json_schema", None),  # Get output_json_schema if available
             )
             tasks.append(task)
 

{fleet_python-0.2.60/fleet/_async → fleet_python-0.2.61/fleet}/models.py

@@ -55,7 +55,9 @@ class Instance(BaseModel):
 
 class InstanceRequest(BaseModel):
     env_key: str = Field(..., title="Env Key")
-    version: Optional[str] = Field(None, title="Version")
+    env_version: Optional[str] = Field(None, title="Env Version")
+    data_key: Optional[str] = Field(None, title="Data Key")
+    data_version: Optional[str] = Field(None, title="Data Version")
     region: Optional[str] = Field("us-west-1", title="Region")
     seed: Optional[int] = Field(None, title="Seed")
     timestamp: Optional[int] = Field(None, title="Timestamp")
@@ -65,6 +67,7 @@ class InstanceRequest(BaseModel):
     task_id: Optional[str] = Field(None, title="Task Id")
     force_pull: Optional[bool] = Field(None, title="Force Pull")
     env_variables: Optional[Dict[str, Any]] = Field(None, title="Env Variables")
+    image_type: Optional[str] = Field(None, title="Image Type")
     created_from: Optional[str] = Field(None, title="Created From")
 
 
@@ -154,6 +157,9 @@ class TaskRequest(BaseModel):
     verifier_id: Optional[str] = Field(None, title="Verifier Id")
     version: Optional[str] = Field(None, title="Version")
     env_variables: Optional[Dict[str, Any]] = Field(None, title="Env Variables")
+    output_json_schema: Optional[Dict[str, Any]] = Field(
+        None, title="Output Json Schema"
+    )
 
 
 class TaskUpdateRequest(BaseModel):
@@ -180,8 +186,13 @@ class TaskResponse(BaseModel):
     verifier_id: Optional[str] = Field(None, title="Verifier Id")
     verifier_func: Optional[str] = Field(None, title="Verifier Func")
     version: Optional[str] = Field(None, title="Version")
+    data_id: Optional[str] = Field(None, title="Data Id")
+    data_version: Optional[str] = Field(None, title="Data Version")
     env_variables: Optional[Dict[str, Any]] = Field(None, title="Env Variables")
     verifier: Optional[VerifierData] = Field(None, title="Verifier")
+    output_json_schema: Optional[Dict[str, Any]] = Field(
+        None, title="Output Json Schema"
+    )
 
 
 class ValidationError(BaseModel):

{fleet_python-0.2.60 → fleet_python-0.2.61}/fleet/tasks.py

@@ -39,6 +39,9 @@ class Task(BaseModel):
     metadata: Optional[Dict[str, Any]] = Field(
         default_factory=dict, description="Additional task metadata"
     )
+    output_json_schema: Optional[Dict[str, Any]] = Field(
+        None, description="JSON schema for expected output format"
+    )
 
     @validator("key")
     def validate_key_format(cls, v):
@@ -330,6 +333,7 @@ def load_tasks(
     version: Optional[str] = None,
     team_id: Optional[str] = None,
     project_key: Optional[str] = None,
+    task_project_key: Optional[str] = None,
     data_id: Optional[str] = None,
     data_version: Optional[str] = None,
 ) -> List[Task]:
@@ -341,6 +345,7 @@ def load_tasks(
         version: Optional version to filter tasks by
         team_id: Optional team_id to filter by (admin only)
         project_key: Optional project key to filter tasks by
+        task_project_key: Optional task project key to filter tasks by
         data_id: Optional data identifier to filter tasks by
         data_version: Optional data version to filter tasks by
 
@@ -360,6 +365,7 @@ def load_tasks(
         version=version,
         team_id=team_id,
         project_key=project_key,
+        task_project_key=task_project_key,
         data_id=data_id,
         data_version=data_version,
     )

{fleet_python-0.2.60 → fleet_python-0.2.61}/fleet_python.egg-info/PKG-INFO

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

{fleet_python-0.2.60 → fleet_python-0.2.61}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fleet-python"
-version = "0.2.60"
+version = "0.2.61"
 description = "Python SDK for Fleet environments"
 authors = [
     {name = "Fleet AI", email = "nic@fleet.so"},