futurehouse-client 0.4.0__tar.gz → 0.4.1__tar.gz

{futurehouse_client-0.4.0/futurehouse_client.egg-info → futurehouse_client-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.0
+Version: 0.4.1
 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.0 → futurehouse_client-0.4.1}/futurehouse_client/__init__.py

@@ -8,6 +8,11 @@ from .models.app import (
     TaskResponse,
     TaskResponseVerbose,
 )
+from .utils.world_model_tools import (
+    create_world_model_tool,
+    make_world_model_tools,
+    search_world_model_tool,
+)
 
 __all__ = [
     "FinchTaskResponse",
@@ -19,4 +24,7 @@ __all__ = [
     "TaskRequest",
     "TaskResponse",
     "TaskResponseVerbose",
+    "create_world_model_tool",
+    "make_world_model_tools",
+    "search_world_model_tool",
 ]

{futurehouse_client-0.4.0 → futurehouse_client-0.4.1}/futurehouse_client/clients/rest_client.py

@@ -136,6 +136,10 @@ class WorldModelCreationError(RestClientError):
     """Raised when there's an error creating a world model."""
 
 
+class WorldModelDeletionError(RestClientError):
+    """Raised when there's an error deleting a world model."""
+
+
 class ProjectError(RestClientError):
     """Raised when there's an error with trajectory group operations."""
 
@@ -1593,6 +1597,49 @@ class RestClient:
         except Exception as e:
             raise WorldModelFetchError(f"An unexpected error occurred: {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,
+    )
+    def search_world_models(
+        self,
+        query: str,
+        size: int = 10,
+        total_search_size: int = 50,
+        search_all_versions: bool = False,
+    ) -> list[str]:
+        """Search for world models.
+
+        Args:
+            query: The search query.
+            size: The number of results to return.
+            total_search_size: The number of results to search for.
+            search_all_versions: Whether to search all versions of the world model or just the latest one.
+
+        Returns:
+            A list of world model names.
+        """
+        try:
+            # Use the consolidated endpoint with search parameters
+            response = self.client.get(
+                "/v0.1/world-models",
+                params={
+                    "q": query,
+                    "size": size,
+                    "search_all_versions": search_all_versions,
+                },
+            )
+            response.raise_for_status()
+            # The new endpoint returns a list of models directly
+            return response.json()
+        except HTTPStatusError as e:
+            raise WorldModelFetchError(
+                f"Error searching world models: {e.response.status_code} - {e.response.text}"
+            ) from e
+        except Exception as e:
+            raise WorldModelFetchError(f"An unexpected error occurred: {e!r}.") from e
+
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
@@ -1668,6 +1715,32 @@ class RestClient:
                 f"An unexpected error occurred during world model 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,
+    )
+    async def delete_world_model(self, world_model_id: UUID) -> None:
+        """Delete a world model snapshot by its ID.
+
+        Args:
+            world_model_id: The unique ID of the world model snapshot to delete.
+
+        Raises:
+            WorldModelDeletionError: If the API call fails.
+        """
+        try:
+            response = await self.async_client.delete(
+                f"/v0.1/world-models/{world_model_id}"
+            )
+            response.raise_for_status()
+        except HTTPStatusError as e:
+            raise WorldModelDeletionError(
+                f"Error deleting world model: {e.response.status_code} - {e.response.text}"
+            ) from e
+        except Exception as e:
+            raise WorldModelDeletionError(f"An unexpected error occurred: {e}") from e
+
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),

{futurehouse_client-0.4.0 → futurehouse_client-0.4.1}/futurehouse_client/models/app.py

@@ -27,10 +27,7 @@ if TYPE_CHECKING:
 MAX_CROW_JOB_RUN_TIMEOUT = 60 * 60 * 24  # 24 hours in sec
 MIN_CROW_JOB_RUN_TIMEOUT = 0  # sec
 
-
-class PythonVersion(StrEnum):
-    V3_11 = "3.11"
-    V3_12 = "3.12"
+DEFAULT_PYTHON_VERSION_USED_FOR_JOB_BUILDS = "3.13"
 
 
 class AuthType(StrEnum):
@@ -420,9 +417,9 @@ class JobDeploymentConfig(BaseModel):
         description="The configuration for the cloud run container.",
     )
 
-    python_version: PythonVersion = Field(
-        default=PythonVersion.V3_12,
-        description="The python version your docker image should build with.",
+    python_version: str = Field(
+        default=DEFAULT_PYTHON_VERSION_USED_FOR_JOB_BUILDS,
+        description="The python version your docker image should build with (e.g., '3.11', '3.12', '3.13').",
     )
 
     agent: Agent | AgentConfig | str = Field(

futurehouse_client-0.4.1/futurehouse_client/utils/world_model_tools.py

@@ -0,0 +1,70 @@
+import os
+from uuid import UUID
+
+from aviary.core import Tool
+
+from futurehouse_client.clients.rest_client import RestClient
+from futurehouse_client.models.app import Stage
+from futurehouse_client.models.rest import WorldModel
+
+
+class WorldModelTools:
+    _client: RestClient | None = None
+
+    @classmethod
+    def _get_client(cls) -> RestClient:
+        """Lazy initialization of the RestClient to avoid validation errors during import."""
+        if cls._client is None:
+            api_key = os.getenv("FH_PLATFORM_API_KEY")
+            if not api_key:
+                raise ValueError(
+                    "FH_PLATFORM_API_KEY environment variable is required for WorldModelTools"
+                )
+            cls._client = RestClient(
+                stage=Stage.from_string(os.getenv("CROW_ENV", "dev")),
+                api_key=api_key,
+            )
+        return cls._client
+
+    @staticmethod
+    def create_world_model(name: str, description: str, content: str) -> UUID:
+        """Create a new world model.
+
+        Args:
+            name: The name of the world model.
+            description: A description of the world model.
+            content: The content/data of the world model.
+
+        Returns:
+            UUID: The ID of the newly created world model.
+        """
+        world_model = WorldModel(
+            name=name,
+            description=description,
+            content=content,
+        )
+        return WorldModelTools._get_client().create_world_model(world_model)
+
+    @staticmethod
+    def search_world_models(query: str, size: int = 10) -> list[str]:
+        """Search for world models using a text query.
+
+        Args:
+            query: The search query string to match against world model content.
+            size: The number of results to return (default: 10).
+
+        Returns:
+            list[str]: A list of world model IDs that match the search query.
+        """
+        return WorldModelTools._get_client().search_world_models(query, size=size)
+
+
+create_world_model_tool = Tool.from_function(WorldModelTools.create_world_model)
+search_world_model_tool = Tool.from_function(WorldModelTools.search_world_models)
+
+
+def make_world_model_tools() -> list[Tool]:
+    return [
+        search_world_model_tool,
+        create_world_model_tool,
+    ]

{futurehouse_client-0.4.0 → futurehouse_client-0.4.1}/futurehouse_client/version.py

@@ -1,14 +1,7 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -16,19 +9,13 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
-    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.0'
-__version_tuple__ = version_tuple = (0, 4, 0)
-
-__commit_id__ = commit_id = 'g5229864ab'
+__version__ = version = '0.4.1'
+__version_tuple__ = version_tuple = (0, 4, 1)

{futurehouse_client-0.4.0 → futurehouse_client-0.4.1/futurehouse_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.0
+Version: 0.4.1
 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.0 → futurehouse_client-0.4.1}/futurehouse_client.egg-info/SOURCES.txt

@@ -23,5 +23,6 @@ futurehouse_client/utils/auth.py
 futurehouse_client/utils/general.py
 futurehouse_client/utils/module_utils.py
 futurehouse_client/utils/monitoring.py
+futurehouse_client/utils/world_model_tools.py
 tests/test_client.py
 tests/test_rest.py