futurehouse-client 0.4.5.dev119__py3-none-any.whl → 0.4.5.dev160__py3-none-any.whl

futurehouse_client/__init__.py

@@ -8,6 +8,13 @@ from .models.app import (
     TaskResponse,
     TaskResponseVerbose,
 )
+from .models.job_event import (
+    CostComponent,
+    ExecutionType,
+    JobEventCreateRequest,
+    JobEventCreateResponse,
+    JobEventUpdateRequest,
+)
 from .utils.world_model_tools import (
     create_world_model_tool,
     make_world_model_tools,
@@ -15,9 +22,14 @@ from .utils.world_model_tools import (
 )
 
 __all__ = [
+    "CostComponent",
+    "ExecutionType",
     "FinchTaskResponse",
     "FutureHouseClient",
     "JobClient",
+    "JobEventCreateRequest",
+    "JobEventCreateResponse",
+    "JobEventUpdateRequest",
     "JobNames",
     "PQATaskResponse",
     "PhoenixTaskResponse",

futurehouse_client/clients/rest_client.py

@@ -52,6 +52,11 @@ from futurehouse_client.models.app import (
     TaskResponseVerbose,
     TrajectoryQueryParams,
 )
+from futurehouse_client.models.job_event import (
+    JobEventCreateRequest,
+    JobEventCreateResponse,
+    JobEventUpdateRequest,
+)
 from futurehouse_client.models.rest import (
     DiscoveryResponse,
     ExecutionStatus,
@@ -160,6 +165,18 @@ class FileUploadError(RestClientError):
     """Raised when there's an error uploading a file."""
 
 
+class JobEventClientError(RestClientError):
+    """Raised when there's an error with job event operations."""
+
+
+class JobEventCreationError(JobEventClientError):
+    """Raised when there's an error creating a job event."""
+
+
+class JobEventUpdateError(JobEventClientError):
+    """Raised when there's an error updating a job event."""
+
+
 retry_if_connection_error = create_retry_if_connection_error(FileUploadError)
 
 DEFAULT_AGENT_TIMEOUT: int = 2400  # seconds
@@ -2609,6 +2626,176 @@ class RestClient(DataStorageMethods):
                 f"Error fetching discoveries for project: {e!r}"
             ) from e
 
+    @retry(
+        stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
+        wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
+        retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+    )
+    def create_job_event(
+        self, request: JobEventCreateRequest
+    ) -> JobEventCreateResponse:
+        """Create a new job event.
+
+        Args:
+            request: Job event creation request
+
+        Returns:
+            Job event creation response
+
+        Raises:
+            JobEventCreationError: If the API call fails
+        """
+        try:
+            response = self.client.post(
+                "/v0.1/job-events",
+                json=request.model_dump(exclude_none=True, mode="json"),
+            )
+            response.raise_for_status()
+            return JobEventCreateResponse(**response.json())
+        except HTTPStatusError as e:
+            if e.response.status_code == codes.BAD_REQUEST:
+                raise JobEventCreationError(
+                    f"Invalid job event creation request: {e.response.text}."
+                ) from e
+            if e.response.status_code == codes.NOT_FOUND:
+                raise JobEventCreationError(
+                    f"Execution not found for job event creation: {e.response.text}."
+                ) from e
+            raise JobEventCreationError(
+                f"Error creating job event: {e.response.status_code} - {e.response.text}."
+            ) from e
+        except Exception as e:
+            raise JobEventCreationError(
+                f"An unexpected error occurred during job event creation: {e!r}."
+            ) from e
+
+    @retry(
+        stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
+        wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
+        retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+    )
+    async def acreate_job_event(
+        self, request: JobEventCreateRequest
+    ) -> JobEventCreateResponse:
+        """Asynchronously create a new job event.
+
+        Args:
+            request: Job event creation request
+
+        Returns:
+            Job event creation response
+
+        Raises:
+            JobEventCreationError: If the API call fails
+        """
+        try:
+            response = await self.async_client.post(
+                "/v0.1/job-events",
+                json=request.model_dump(exclude_none=True, mode="json"),
+            )
+            response.raise_for_status()
+            return JobEventCreateResponse(**response.json())
+        except HTTPStatusError as e:
+            if e.response.status_code == codes.BAD_REQUEST:
+                raise JobEventCreationError(
+                    f"Invalid job event creation request: {e.response.text}."
+                ) from e
+            if e.response.status_code == codes.NOT_FOUND:
+                raise JobEventCreationError(
+                    f"Execution not found for job event creation: {e.response.text}."
+                ) from e
+            raise JobEventCreationError(
+                f"Error creating job event: {e.response.status_code} - {e.response.text}."
+            ) from e
+        except Exception as e:
+            raise JobEventCreationError(
+                f"An unexpected error occurred during job event creation: {e!r}."
+            ) from e
+
+    @retry(
+        stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
+        wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
+        retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+    )
+    def update_job_event(
+        self, job_event_id: UUID, request: JobEventUpdateRequest
+    ) -> None:
+        """Update an existing job event.
+
+        Args:
+            job_event_id: ID of the job event to update
+            request: Job event update request
+
+        Raises:
+            JobEventUpdateError: If the API call fails
+        """
+        try:
+            response = self.client.patch(
+                f"/v0.1/job-events/{job_event_id}",
+                json=request.model_dump(exclude_none=True, mode="json"),
+            )
+            response.raise_for_status()
+        except HTTPStatusError as e:
+            if e.response.status_code == codes.NOT_FOUND:
+                raise JobEventUpdateError(
+                    f"Job event with ID {job_event_id} not found."
+                ) from e
+            if e.response.status_code == codes.BAD_REQUEST:
+                raise JobEventUpdateError(
+                    f"Invalid job event update request: {e.response.text}."
+                ) from e
+            raise JobEventUpdateError(
+                f"Error updating job event: {e.response.status_code} - {e.response.text}."
+            ) from e
+        except Exception as e:
+            raise JobEventUpdateError(
+                f"An unexpected error occurred during job event update: {e!r}."
+            ) from e
+
+    @retry(
+        stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
+        wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
+        retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+    )
+    async def aupdate_job_event(
+        self, job_event_id: UUID, request: JobEventUpdateRequest
+    ) -> None:
+        """Asynchronously update an existing job event.
+
+        Args:
+            job_event_id: ID of the job event to update
+            request: Job event update request
+
+        Raises:
+            JobEventUpdateError: If the API call fails
+        """
+        try:
+            response = await self.async_client.patch(
+                f"/v0.1/job-events/{job_event_id}",
+                json=request.model_dump(exclude_none=True, mode="json"),
+            )
+            response.raise_for_status()
+        except HTTPStatusError as e:
+            if e.response.status_code == codes.NOT_FOUND:
+                raise JobEventUpdateError(
+                    f"Job event with ID {job_event_id} not found."
+                ) from e
+            if e.response.status_code == codes.BAD_REQUEST:
+                raise JobEventUpdateError(
+                    f"Invalid job event update request: {e.response.text}."
+                ) from e
+            raise JobEventUpdateError(
+                f"Error updating job event: {e.response.status_code} - {e.response.text}."
+            ) from e
+        except Exception as e:
+            raise JobEventUpdateError(
+                f"An unexpected error occurred during job event update: {e!r}."
+            ) from e
+
 
 def get_installed_packages() -> dict[str, str]:
     """Returns a dictionary of installed packages and their versions."""

futurehouse_client/models/__init__.py

@@ -13,13 +13,25 @@ from .app import (
     TaskResponse,
     TaskResponseVerbose,
 )
+from .job_event import (
+    CostComponent,
+    ExecutionType,
+    JobEventCreateRequest,
+    JobEventCreateResponse,
+    JobEventUpdateRequest,
+)
 from .rest import TrajectoryPatchRequest, WorldModel, WorldModelResponse
 
 __all__ = [
     "AuthType",
+    "CostComponent",
     "DockerContainerConfiguration",
+    "ExecutionType",
     "FramePath",
     "JobDeploymentConfig",
+    "JobEventCreateRequest",
+    "JobEventCreateResponse",
+    "JobEventUpdateRequest",
     "PQATaskResponse",
     "RuntimeConfig",
     "Stage",

futurehouse_client/models/client.py

@@ -2,7 +2,6 @@ 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
@@ -35,6 +34,10 @@ 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()
@@ -59,64 +62,6 @@ 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:
-            last_step_state = self.last_step_state
-            if last_step_state.next_observation:
-                return last_step_state.next_observation
-        if self.observations:
-            return self.observations
-        return current_obs or []
-
-    def create_step_state(self, callback_type: str, **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
@@ -124,5 +69,4 @@ StateType: TypeAlias = (
     | EnvResetState
     | EnvStepState
     | TransitionState
-    | GlobalState
 )

futurehouse_client/models/job_event.py

@@ -0,0 +1,75 @@
+"""Job event models for cost and usage tracking."""
+
+from datetime import datetime
+from enum import StrEnum, auto
+from typing import Any
+from uuid import UUID
+
+from pydantic import BaseModel, Field
+
+
+class ExecutionType(StrEnum):
+    """Type of execution for job events."""
+
+    TRAJECTORY = auto()
+    SESSION = auto()
+
+
+class CostComponent(StrEnum):
+    """Cost component types for job events."""
+
+    LLM_USAGE = auto()
+    EXTERNAL_SERVICE = auto()
+    STEP = auto()
+
+
+class JobEventCreateRequest(BaseModel):
+    """Request model for creating a job event matching crow-service schema."""
+
+    execution_id: UUID = Field(description="UUID for trajectory_id or session_id")
+    execution_type: ExecutionType = Field(
+        description="Either 'TRAJECTORY' or 'SESSION'"
+    )
+    cost_component: CostComponent = Field(
+        description="Cost component: 'LLM_USAGE', 'EXTERNAL_SERVICE', or 'STEP'"
+    )
+    started_at: datetime = Field(description="Start time of the job event")
+    ended_at: datetime = Field(description="End time of the job event")
+    crow: str | None = Field(default=None, description="unique identifier for the crow")
+    amount_acu: float | None = Field(default=None, description="Cost amount in ACUs")
+    amount_usd: float | None = Field(default=None, description="Cost amount in USD")
+    rate: float | None = Field(default=None, description="Rate per token/call in USD")
+    input_token_count: int | None = Field(
+        default=None, description="Input token count for LLM calls"
+    )
+    completion_token_count: int | None = Field(
+        default=None, description="Completion token count for LLM calls"
+    )
+    metadata: dict[str, Any] | None = Field(default=None)
+
+
+class JobEventUpdateRequest(BaseModel):
+    """Request model for updating a job event matching crow-service schema."""
+
+    amount_acu: float | None = Field(default=None, description="Cost amount in ACUs")
+    amount_usd: float | None = Field(default=None, description="Cost amount in USD")
+    rate: float | None = Field(default=None, description="Rate per token/call in USD")
+    input_token_count: int | None = Field(
+        default=None, description="Input token count for LLM calls"
+    )
+    completion_token_count: int | None = Field(
+        default=None, description="Completion token count for LLM calls"
+    )
+    metadata: dict[str, Any] | None = Field(default=None)
+    started_at: datetime | None = Field(
+        default=None, description="Start time of the job event"
+    )
+    ended_at: datetime | None = Field(
+        default=None, description="End time of the job event"
+    )
+
+
+class JobEventCreateResponse(BaseModel):
+    """Response model for job event creation."""
+
+    id: UUID = Field(description="UUID of the created job event")

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.dev119'
-__version_tuple__ = version_tuple = (0, 4, 5, 'dev119')
+__version__ = version = '0.4.5.dev160'
+__version_tuple__ = version_tuple = (0, 4, 5, 'dev160')
 
 __commit_id__ = commit_id = None

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.5.dev119
+Version: 0.4.5.dev160
 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.dev119.dist-info → futurehouse_client-0.4.5.dev160.dist-info}/RECORD

@@ -1,14 +1,15 @@
-futurehouse_client/__init__.py,sha256=PvFTkocA-hobsWoDEBEdrUgLIbuVbDs_0nvMdImJmHk,707
+futurehouse_client/__init__.py,sha256=q5cpcuPkhTaueXsySsgWpH0F-2EsRxcdJfP91ze6khU,991
 futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/version.py,sha256=ygTkTx_4WMa3DIXWf_ZxjBUe9cI-wOluDVgxQX8thfA,721
+futurehouse_client/version.py,sha256=6BA6oRbUzdnpPhiNHEHGYWEa8NjSzYLRAwSlZ3RVS6Y,721
 futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
 futurehouse_client/clients/data_storage_methods.py,sha256=f8ZsVicEtO50pRXoPzEB2GpiyqosNofyoW8vJeYvFnM,119266
 futurehouse_client/clients/job_client.py,sha256=b5gpzulZpxpv9R337r3UKItnMdtd6CGlI1sV3_VQJso,13985
-futurehouse_client/clients/rest_client.py,sha256=RdyFEipvADDCHyY5XFy565IoL9-N1myJjF0G8x2wlK8,103183
-futurehouse_client/models/__init__.py,sha256=0YlzKGymbY1g4cXxnUc0BUnthTkVBf12bCZlGUcMQqk,701
+futurehouse_client/clients/rest_client.py,sha256=kLCR4dYduwX_16jaOZ26RGCOR2A_6nk2gpBKUqQ-KVI,110247
+futurehouse_client/models/__init__.py,sha256=N1MwDUYonsMN9NdaShsYcJspyL7H756MYj7VWFeD3fk,978
 futurehouse_client/models/app.py,sha256=UUg17I3zk6cH_7mrdojHGYvQfm_SeDkuUxsPlRyIYz0,31895
-futurehouse_client/models/client.py,sha256=3WLS0xdB7CYqHShi_gqyRa6PGj-QvP--0HzD1R93yvY,3868
+futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
 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
 futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 futurehouse_client/utils/auth.py,sha256=tgWELjKfg8eWme_qdcRmc8TjQN9DVZuHHaVXZNHLchk,2960
@@ -16,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.dev119.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
-futurehouse_client-0.4.5.dev119.dist-info/METADATA,sha256=_GrNdEBxKiRCI4lXWI8WcIBjVRTEMF_FqvvrQcT3l_E,27101
-futurehouse_client-0.4.5.dev119.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-futurehouse_client-0.4.5.dev119.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.4.5.dev119.dist-info/RECORD,,
+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,,