futurehouse-client 0.3.14__py3-none-any.whl → 0.3.15.dev15__py3-none-any.whl

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 (
@@ -575,7 +576,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/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.dist-info → futurehouse_client-0.3.15.dev15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.14
+Version: 0.3.15.dev15
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 Classifier: Operating System :: OS Independent

{futurehouse_client-0.3.14.dist-info → futurehouse_client-0.3.15.dev15.dist-info}/RECORD

@@ -1,15 +1,15 @@
 futurehouse_client/__init__.py,sha256=ddxO7JE97c6bt7LjNglZZ2Ql8bYCGI9laSFeh9MP6VU,344
 futurehouse_client/clients/__init__.py,sha256=tFWqwIAY5PvwfOVsCje4imjTpf6xXNRMh_UHIKVI1_0,320
 futurehouse_client/clients/job_client.py,sha256=yBFKDNcFnuZDNgoK2d5037rbuzQ7TlSK6MmklEKV8EA,11056
-futurehouse_client/clients/rest_client.py,sha256=ZCGhKCNzDtaLRPjhciKXdjbR_PYHKkBt7SSa8ansuaM,25961
+futurehouse_client/clients/rest_client.py,sha256=dJCVIC3kya32aiopgbbxWASIQeLdSx_N7I3Qx1ojaZM,26152
 futurehouse_client/models/__init__.py,sha256=ta3jFLM_LsDz1rKDmx8rja8sT7WtSKoFvMgLF0yFpvA,342
-futurehouse_client/models/app.py,sha256=G8_-I3aQnRIyxFJT3snTSWsPcZZ2nEvYkRaE5sVdeys,22299
+futurehouse_client/models/app.py,sha256=yfZ9tyw4VATVAfYrU7aTdCNPSljLEho09_nIbh8oZDY,23174
 futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
 futurehouse_client/models/rest.py,sha256=W-wNFTN7HALYFFphw-RQYRMm6_TSa1cl4T-mZ1msk90,393
 futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 futurehouse_client/utils/module_utils.py,sha256=aFyd-X-pDARXz9GWpn8SSViUVYdSbuy9vSkrzcVIaGI,4955
 futurehouse_client/utils/monitoring.py,sha256=UjRlufe67kI3VxRHOd5fLtJmlCbVA2Wqwpd4uZhXkQM,8728
-futurehouse_client-0.3.14.dist-info/METADATA,sha256=c9UmLGXB5dvyOZxZt2PbgtI4-7uSLqO_nQhzyw_-OSs,8138
-futurehouse_client-0.3.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-futurehouse_client-0.3.14.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.3.14.dist-info/RECORD,,
+futurehouse_client-0.3.15.dev15.dist-info/METADATA,sha256=exsvwQgSFOReYW5xOUAl1eOVIuyl2aQ77Fb9wKtGaCE,8144
+futurehouse_client-0.3.15.dev15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+futurehouse_client-0.3.15.dev15.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.3.15.dev15.dist-info/RECORD,,