futurehouse-client 0.4.5.dev160__py3-none-any.whl → 0.5.0__py3-none-any.whl

futurehouse_client/clients/data_storage_methods.py

@@ -2492,7 +2492,11 @@ class DataStorageMethods:
                 return [
                     self._download_from_gcs(
                         location.storage_config.signed_url or "",
-                        (location.storage_config.location or "").split("/")[-1],
+                        (
+                            Path(location.storage_config.location).name
+                            if location.storage_config.location
+                            else None
+                        ),
                     )
                     for location in result.storage_locations
                 ]
@@ -2508,7 +2512,12 @@ class DataStorageMethods:
                     )
 
                 return self._download_from_gcs(
-                    storage_location.storage_config.signed_url
+                    storage_location.storage_config.signed_url,
+                    (
+                        storage_location.storage_config.location.split("/")[-1]
+                        if storage_location.storage_config.location
+                        else None
+                    ),
                 )
 
             if storage_type in {"raw_content", "pg_table"}:
@@ -2568,7 +2577,11 @@ class DataStorageMethods:
                     [
                         self._adownload_from_gcs(
                             location.storage_config.signed_url or "",
-                            (location.storage_config.location or "").split("/")[-1],
+                            (
+                                location.storage_config.location.split("/")[-1]
+                                if location.storage_config.location
+                                else None
+                            ),
                         )
                         for location in result.storage_locations
                     ],
@@ -2585,7 +2598,12 @@ class DataStorageMethods:
                     )
 
                 return await self._adownload_from_gcs(
-                    storage_location.storage_config.signed_url
+                    storage_location.storage_config.signed_url,
+                    (
+                        storage_location.storage_config.location.split("/")[-1]
+                        if storage_location.storage_config.location
+                        else None
+                    ),
                 )
 
             if storage_type in {"raw_content", "pg_table"}:

futurehouse_client/clients/rest_client.py

@@ -676,7 +676,7 @@ class RestClient(DataStorageMethods):
             )
 
         response = self.client.post(
-            "/v0.1/crows", json=task_data.model_dump(mode="json")
+            "/v0.1/crows", json=task_data.model_dump(mode="json", by_alias=True)
         )
         if response.status_code in {401, 403}:
             raise PermissionError(
@@ -712,7 +712,7 @@ class RestClient(DataStorageMethods):
             )
 
         response = await self.async_client.post(
-            "/v0.1/crows", json=task_data.model_dump(mode="json")
+            "/v0.1/crows", json=task_data.model_dump(mode="json", by_alias=True)
         )
         if response.status_code in {401, 403}:
             raise PermissionError(

futurehouse_client/models/client.py

@@ -2,10 +2,13 @@ from typing import Any, Generic, TypeAlias, TypeVar
 
 from aviary.message import Message
 from aviary.tools.base import Tool
+from ldp.agent import Agent
 from ldp.data_structures import Transition
 from ldp.graph.ops import OpResult
 from pydantic import BaseModel, ConfigDict, Field, field_serializer
 
+from .app import Step
+
 T = TypeVar("T")
 
 
@@ -34,10 +37,6 @@ class ASVState(BaseState, Generic[T]):
     def serialize_action(self, action: OpResult[T]) -> dict:
         return action.to_dict()
 
-    @field_serializer("next_state")
-    def serialize_next_state(self, state: Any) -> str:
-        return str(state)
-
 
 class EnvResetState(BaseState):
     observations: list[Message] = Field()
@@ -62,6 +61,62 @@ class TransitionState(BaseState):
         }
 
 
+class GlobalState(BaseState):
+    agent: Agent | None = None
+    env: Any | None = None
+    agent_state: Any | None = None
+    next_agent_state: Any | None = None
+    observations: list = []
+    action: Any | None = None
+    value: float = 0.0
+    last_step_state: Transition | None = None
+
+    def update_observations(self, obs: list[Message]) -> list[Message]:
+        previous_observations = self.observations or []
+        self.observations = obs
+        return previous_observations
+
+    def store_step_state(self, step_state: Transition) -> None:
+        self.last_step_state = step_state
+
+    def update_trajectory_data(self, **kwargs) -> None:
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+    def _get_safe_previous_observations(
+        self, current_obs: list[Message] | None = None
+    ) -> list[Message]:
+        if self.last_step_state and self.last_step_state.next_observation:
+            return self.last_step_state.next_observation
+        if self.observations:
+            return self.observations
+        return current_obs or []
+
+    def create_step_state(self, callback_type: Step, **kwargs) -> Transition:
+        defaults = {
+            "timestep": getattr(self.agent, "_timestep", 0) if self.agent else 0,
+            "agent_state": self.agent_state,
+            "next_agent_state": self.next_agent_state or self.agent_state,
+            "observation": self._get_safe_previous_observations(),
+            "next_observation": self.observations or [],
+            "action": self.action,
+            "reward": 0.0,
+            "truncated": False,
+            "done": False,
+            "value": self.value or 0.0,
+            "metadata": {"callback_type": callback_type},
+        }
+
+        for key, value in kwargs.items():
+            if key == "metadata" and isinstance(value, dict):
+                if isinstance(defaults["metadata"], dict):
+                    defaults["metadata"].update(value)
+            else:
+                defaults[key] = value
+
+        return Transition(**defaults)
+
+
 StateType: TypeAlias = (
     BeforeTransitionState
     | InitialState
@@ -69,4 +124,5 @@ StateType: TypeAlias = (
     | EnvResetState
     | EnvStepState
     | TransitionState
+    | GlobalState
 )

futurehouse_client/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.5.dev160'
-__version_tuple__ = version_tuple = (0, 4, 5, 'dev160')
+__version__ = version = '0.5.0'
+__version_tuple__ = version_tuple = (0, 5, 0)
 
 __commit_id__ = commit_id = None

{futurehouse_client-0.4.5.dev160.dist-info → futurehouse_client-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.5.dev160
+Version: 0.5.0
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License

{futurehouse_client-0.4.5.dev160.dist-info → futurehouse_client-0.5.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 futurehouse_client/__init__.py,sha256=q5cpcuPkhTaueXsySsgWpH0F-2EsRxcdJfP91ze6khU,991
 futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/version.py,sha256=6BA6oRbUzdnpPhiNHEHGYWEa8NjSzYLRAwSlZ3RVS6Y,721
+futurehouse_client/version.py,sha256=fvHpBU3KZKRinkriKdtAt3crenOyysELF-M9y3ozg3U,704
 futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
-futurehouse_client/clients/data_storage_methods.py,sha256=f8ZsVicEtO50pRXoPzEB2GpiyqosNofyoW8vJeYvFnM,119266
+futurehouse_client/clients/data_storage_methods.py,sha256=wnKu8CazlEX_BQauX1qvZRRw7EpbD0oofmH1wXLnDf8,120034
 futurehouse_client/clients/job_client.py,sha256=b5gpzulZpxpv9R337r3UKItnMdtd6CGlI1sV3_VQJso,13985
-futurehouse_client/clients/rest_client.py,sha256=kLCR4dYduwX_16jaOZ26RGCOR2A_6nk2gpBKUqQ-KVI,110247
+futurehouse_client/clients/rest_client.py,sha256=tLskIkiR6-Acbo2W1_UUNdIjiYfZMURaN_Mi0aJPWXg,110277
 futurehouse_client/models/__init__.py,sha256=N1MwDUYonsMN9NdaShsYcJspyL7H756MYj7VWFeD3fk,978
 futurehouse_client/models/app.py,sha256=UUg17I3zk6cH_7mrdojHGYvQfm_SeDkuUxsPlRyIYz0,31895
-futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
+futurehouse_client/models/client.py,sha256=554vp7Cr-17BTeRZtN5DhCRQesRRtr31ZPkHXUrhyCE,3835
 futurehouse_client/models/data_storage_methods.py,sha256=cpF2g4y_REECaz--WhaJeLqXA_3m3keRP5XOXiL8GOI,13811
 futurehouse_client/models/job_event.py,sha256=lMrx-lV7BQkKl419ErWZ6Q1EjurmhBFSns0z6zwGaVo,2766
 futurehouse_client/models/rest.py,sha256=SbeXZSPUCM0lQ_gVUPa64vKzMxuUVgqmJ5YThfDWs8g,4726
@@ -17,8 +17,8 @@ futurehouse_client/utils/general.py,sha256=PIkGLCSA3kUvc6mwR-prEB7YnMdKILOIm6cPo
 futurehouse_client/utils/module_utils.py,sha256=aFyd-X-pDARXz9GWpn8SSViUVYdSbuy9vSkrzcVIaGI,4955
 futurehouse_client/utils/monitoring.py,sha256=UjRlufe67kI3VxRHOd5fLtJmlCbVA2Wqwpd4uZhXkQM,8728
 futurehouse_client/utils/world_model_tools.py,sha256=v2krZGrco0ur2a_pcRMtnQL05SxlIoBXuJ5R1JkQNws,2921
-futurehouse_client-0.4.5.dev160.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
-futurehouse_client-0.4.5.dev160.dist-info/METADATA,sha256=ulzDMOtoPKkLAJxL6JPcqSzmuTqOmP5wxiB7l3bm_qM,27101
-futurehouse_client-0.4.5.dev160.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-futurehouse_client-0.4.5.dev160.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.4.5.dev160.dist-info/RECORD,,
+futurehouse_client-0.5.0.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
+futurehouse_client-0.5.0.dist-info/METADATA,sha256=4lMUB0HZPj5tBCb2l5QxCwjBzk9KtOG73V_zNxui_ug,27094
+futurehouse_client-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+futurehouse_client-0.5.0.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.5.0.dist-info/RECORD,,