futurehouse-client 0.3.14__tar.gz → 0.3.15__tar.gz

{futurehouse_client-0.3.14 → futurehouse_client-0.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.14
+Version: 0.3.15
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 Classifier: Operating System :: OS Independent
@@ -15,6 +15,7 @@ Requires-Dist: dm-tree<0.1.9
 Requires-Dist: fhaviary
 Requires-Dist: httpx
 Requires-Dist: ldp>=0.22.0
+Requires-Dist: litellm==1.67.4.post1
 Requires-Dist: pydantic
 Requires-Dist: python-dotenv
 Requires-Dist: tenacity

{futurehouse_client-0.3.14 → futurehouse_client-0.3.15}/futurehouse_client/clients/rest_client.py

@@ -26,6 +26,7 @@ from httpx import (
     ReadTimeout,
     RemoteProtocolError,
 )
+from ldp.agent import AgentConfig
 from pydantic import BaseModel, ConfigDict, model_validator
 from requests.exceptions import RequestException, Timeout
 from tenacity import (
@@ -100,6 +101,12 @@ class InvalidTaskDescriptionError(Exception):
     """Raised when the task description is invalid or empty."""
 
 
+class SimpleOrganization(BaseModel):
+    id: int
+    name: str
+    display_name: str
+
+
 # 5 minute default for JWTs
 JWT_TOKEN_CACHE_EXPIRY: int = 300  # seconds
 
@@ -115,7 +122,7 @@ class TaskResponse(BaseModel):
     created_at: datetime
     job_name: str
     public: bool
-    shared_with: list[str]
+    shared_with: list[SimpleOrganization] | None = None
     build_owner: str | None = None
     environment_name: str | None = None
     agent_name: str | None = None
@@ -190,7 +197,7 @@ class TaskResponseVerbose(TaskResponse):
     agent_state: list[dict[str, Any]] | None = None
     environment_frame: dict[str, Any] | None = None
     metadata: dict[str, Any] | None = None
-    shared_with: list[str]
+    shared_with: list[SimpleOrganization] | None = None
 
 
 class RestClient:
@@ -575,7 +582,11 @@ class RestClient:
                 )
             logger.debug(f"Sending files: {[f[1][0] for f in files]}")
             data = {
-                "agent": config.agent,
+                "agent": (
+                    config.agent.model_dump_json()
+                    if isinstance(config.agent, AgentConfig)
+                    else config.agent
+                ),
                 "job_name": config.job_name,
                 "organization": selected_org,
                 "environment": config.environment,

{futurehouse_client-0.3.14 → futurehouse_client-0.3.15}/futurehouse_client/models/app.py

@@ -1,3 +1,4 @@
+import json
 import os
 import re
 from enum import StrEnum, auto
@@ -401,10 +402,10 @@ class JobDeploymentConfig(BaseModel):
         description="The python version your docker image should build with.",
     )
 
-    agent: Agent | str = Field(
+    agent: Agent | AgentConfig | str = Field(
         default="ldp.agent.SimpleAgent",
         description="Your desired agent path, should be a module reference and a fully qualified name. "
-        "example: ldp.agent.SimpleAgent",
+        "example: ldp.agent.SimpleAgent or by instantiating AgentConfig to further customize the agent.",
     )
 
     requires_aviary_internal: bool = Field(
@@ -531,7 +532,12 @@ class JobDeploymentConfig(BaseModel):
 
     @field_validator("agent")
     @classmethod
-    def validate_agent_path(cls, value: Agent | str) -> Agent | str:
+    def validate_agent(
+        cls, value: str | Agent | AgentConfig
+    ) -> str | Agent | AgentConfig:
+        if isinstance(value, AgentConfig):
+            return value
+
         if isinstance(value, Agent):
             return value
 
@@ -584,6 +590,13 @@ class RuntimeConfig(BaseModel):
             "agent selected during Crow deployment in the JobDeploymentConfig object."
         ),
     )
+    environment_config: dict[str, Any] | None = Field(
+        default=None,
+        description=(
+            "Kwargs to be passed to the environment constructor at runtime. "
+            "Not all environments support this functionality."
+        ),
+    )
     continued_job_id: UUID | None = Field(
         default=None,
         description="Optional job identifier for a continued job",
@@ -606,6 +619,19 @@ class RuntimeConfig(BaseModel):
             raise ValueError(f"Invalid agent path format: {value}")
         return value
 
+    @field_validator("environment_config")
+    @classmethod
+    def validate_environment_config(
+        cls, value: dict[str, Any] | None
+    ) -> dict[str, Any] | None:
+        if value is None:
+            return None
+        try:
+            json.dumps(value)
+        except (TypeError, OverflowError) as err:
+            raise ValueError("Environment config must be JSON serializable") from err
+        return value
+
 
 class TaskRequest(BaseModel):
     task_id: UUID | None = Field(

{futurehouse_client-0.3.14 → futurehouse_client-0.3.15}/futurehouse_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.14
+Version: 0.3.15
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 Classifier: Operating System :: OS Independent
@@ -15,6 +15,7 @@ Requires-Dist: dm-tree<0.1.9
 Requires-Dist: fhaviary
 Requires-Dist: httpx
 Requires-Dist: ldp>=0.22.0
+Requires-Dist: litellm==1.67.4.post1
 Requires-Dist: pydantic
 Requires-Dist: python-dotenv
 Requires-Dist: tenacity

{futurehouse_client-0.3.14 → futurehouse_client-0.3.15}/futurehouse_client.egg-info/requires.txt

@@ -3,6 +3,7 @@ dm-tree<0.1.9
 fhaviary
 httpx
 ldp>=0.22.0
+litellm==1.67.4.post1
 pydantic
 python-dotenv
 tenacity

{futurehouse_client-0.3.14 → futurehouse_client-0.3.15}/pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
     "fhaviary",
     "httpx",
     "ldp>=0.22.0",
+    "litellm==1.67.4.post1",  # TODO: remove after: https://github.com/BerriAI/litellm/issues/10349
     "pydantic",
     "python-dotenv",
     "tenacity",
@@ -63,3 +64,9 @@ include = ["futurehouse_client*"]
 local_scheme = "no-local-version"
 root = "../.."
 version_file = "version.py"
+
+[[tool.uv.index]]
+explicit = true
+name = "testpypi"
+publish-url = "https://test.pypi.org/legacy/"
+url = "https://test.pypi.org/"