futurehouse-client 0.4.1.dev95__py3-none-any.whl → 0.4.2.dev11__py3-none-any.whl

futurehouse_client/clients/rest_client.py

@@ -26,14 +26,21 @@ from httpx import (
     AsyncClient,
     Client,
     CloseError,
+    ConnectError,
+    ConnectTimeout,
     HTTPStatusError,
+    NetworkError,
+    ReadError,
+    ReadTimeout,
     RemoteProtocolError,
     codes,
 )
 from ldp.agent import AgentConfig
+from requests.exceptions import RequestException, Timeout
 from tenacity import (
     before_sleep_log,
     retry,
+    retry_if_exception_type,
     stop_after_attempt,
     wait_exponential,
 )
@@ -41,7 +48,6 @@ from tqdm import tqdm as sync_tqdm
 from tqdm.asyncio import tqdm
 
 from futurehouse_client.clients import JobNames
-from futurehouse_client.clients.data_storage_methods import DataStorageMethods
 from futurehouse_client.models.app import (
     AuthType,
     JobDeploymentConfig,
@@ -62,10 +68,7 @@ from futurehouse_client.models.rest import (
     WorldModelResponse,
 )
 from futurehouse_client.utils.auth import RefreshingJWT
-from futurehouse_client.utils.general import (
-    create_retry_if_connection_error,
-    gather_with_concurrency,
-)
+from futurehouse_client.utils.general import gather_with_concurrency
 from futurehouse_client.utils.module_utils import (
     OrganizationSelector,
     fetch_environment_function_docstring,
@@ -157,15 +160,28 @@ class FileUploadError(RestClientError):
     """Raised when there's an error uploading a file."""
 
 
-retry_if_connection_error = create_retry_if_connection_error(FileUploadError)
+retry_if_connection_error = retry_if_exception_type((
+    # From requests
+    Timeout,
+    ConnectionError,
+    RequestException,
+    # From httpx
+    ConnectError,
+    ConnectTimeout,
+    ReadTimeout,
+    ReadError,
+    NetworkError,
+    RemoteProtocolError,
+    CloseError,
+    FileUploadError,
+))
 
 DEFAULT_AGENT_TIMEOUT: int = 2400  # seconds
 
 
 # pylint: disable=too-many-public-methods
-class RestClient(DataStorageMethods):
-    REQUEST_TIMEOUT: ClassVar[float] = 30.0  # sec - for general API calls
-    FILE_UPLOAD_TIMEOUT: ClassVar[float] = 600.0  # 10 minutes - for file uploads
+class RestClient:
+    REQUEST_TIMEOUT: ClassVar[float] = 30.0  # sec
     MAX_RETRY_ATTEMPTS: ClassVar[int] = 3
     RETRY_MULTIPLIER: ClassVar[int] = 1
     MAX_RETRY_WAIT: ClassVar[int] = 10
@@ -223,35 +239,11 @@ class RestClient(DataStorageMethods):
         """Authenticated HTTP client for multipart uploads."""
         return cast(Client, self.get_client(None, authenticated=True))
 
-    @property
-    def file_upload_client(self) -> Client:
-        """Authenticated HTTP client with extended timeout for file uploads."""
-        return cast(
-            Client,
-            self.get_client(
-                "application/json", authenticated=True, timeout=self.FILE_UPLOAD_TIMEOUT
-            ),
-        )
-
-    @property
-    def async_file_upload_client(self) -> AsyncClient:
-        """Authenticated async HTTP client with extended timeout for file uploads."""
-        return cast(
-            AsyncClient,
-            self.get_client(
-                "application/json",
-                authenticated=True,
-                async_client=True,
-                timeout=self.FILE_UPLOAD_TIMEOUT,
-            ),
-        )
-
     def get_client(
         self,
         content_type: str | None = "application/json",
         authenticated: bool = True,
         async_client: bool = False,
-        timeout: float | None = None,
     ) -> Client | AsyncClient:
         """Return a cached HTTP client or create one if needed.
 
@@ -259,13 +251,12 @@ class RestClient(DataStorageMethods):
             content_type: The desired content type header. Use None for multipart uploads.
             authenticated: Whether the client should include authentication.
             async_client: Whether to use an async client.
-            timeout: Custom timeout in seconds. Uses REQUEST_TIMEOUT if not provided.
 
         Returns:
             An HTTP client configured with the appropriate headers.
         """
-        client_timeout = timeout or self.REQUEST_TIMEOUT
-        key = f"{content_type or 'multipart'}_{authenticated}_{async_client}_{client_timeout}"
+        # Create a composite key based on content type and auth flag
+        key = f"{content_type or 'multipart'}_{authenticated}_{async_client}"
 
         if key not in self._clients:
             headers = copy.deepcopy(self.headers)
@@ -291,14 +282,14 @@ class RestClient(DataStorageMethods):
                 AsyncClient(
                     base_url=self.base_url,
                     headers=headers,
-                    timeout=client_timeout,
+                    timeout=self.REQUEST_TIMEOUT,
                     auth=auth,
                 )
                 if async_client
                 else Client(
                     base_url=self.base_url,
                     headers=headers,
-                    timeout=client_timeout,
+                    timeout=self.REQUEST_TIMEOUT,
                     auth=auth,
                 )
             )
@@ -1630,16 +1621,17 @@ class RestClient(DataStorageMethods):
             A list of world model names.
         """
         try:
+            # Use the consolidated endpoint with search parameters
             response = self.client.get(
-                "/v0.1/world-models/search/",
+                "/v0.1/world-models",
                 params={
-                    "query": query,
+                    "q": query,
                     "size": size,
-                    "total_search_size": total_search_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(
@@ -1754,22 +1746,19 @@ class RestClient(DataStorageMethods):
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    def get_project_by_name(self, name: str) -> UUID:
+    def get_project_by_name(self, name: str, limit: int = 2) -> UUID | list[UUID]:
         """Get a project UUID by name.
 
         Args:
             name: The name of the project to find
+            limit: Maximum number of projects to return
 
         Returns:
-            UUID of the project as a string
-
-        Raises:
-            ProjectError: If no project is found, multiple projects are found, or there's an error
+            UUID of the project as a string or a list of UUIDs if multiple projects are found
         """
         try:
-            # Get projects filtered by name (backend now filters by name and owner)
             response = self.client.get(
-                "/v0.1/projects", params={"limit": 2, "name": name}
+                "/v0.1/projects", params={"limit": limit, "name": name}
             )
             response.raise_for_status()
             projects = response.json()
@@ -1782,32 +1771,33 @@ class RestClient(DataStorageMethods):
         if len(projects) == 0:
             raise ProjectError(f"No project found with name '{name}'")
         if len(projects) > 1:
-            raise ProjectError(
+            logger.warning(
                 f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
             )
 
-        return UUID(projects[0]["id"])
+        ids = [UUID(project["id"]) for project in projects]
+        return ids[0] if len(ids) == 1 else ids
 
     @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 aget_project_by_name(self, name: str) -> UUID:
+    async def aget_project_by_name(
+        self, name: str, limit: int = 2
+    ) -> UUID | list[UUID]:
         """Asynchronously get a project UUID by name.
 
         Args:
             name: The name of the project to find
+            limit: Maximum number of projects to return
 
         Returns:
-            UUID of the project as a string
-
-        Raises:
-            ProjectError: If no project is found, multiple projects are found, or there's an error
+            UUID of the project as a string or a list of UUIDs if multiple projects are found
         """
         try:
             response = await self.async_client.get(
-                "/v0.1/projects", params={"limit": 2, "name": name}
+                "/v0.1/projects", params={"limit": limit, "name": name}
             )
             response.raise_for_status()
             projects = response.json()
@@ -1816,11 +1806,12 @@ class RestClient(DataStorageMethods):
         if len(projects) == 0:
             raise ProjectError(f"No project found with name '{name}'")
         if len(projects) > 1:
-            raise ProjectError(
+            logger.warning(
                 f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
             )
 
-        return UUID(projects[0]["id"])
+        ids = [UUID(project["id"]) for project in projects]
+        return ids[0] if len(ids) == 1 else ids
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),

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/models/client.py

@@ -27,17 +27,13 @@ class InitialState(BaseState):
 
 class ASVState(BaseState, Generic[T]):
     action: OpResult[T] = Field()
-    next_state: Any = Field()
+    next_agent_state: Any = Field()
     value: float = Field()
 
     @field_serializer("action")
     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()

futurehouse_client/utils/general.py

@@ -2,45 +2,11 @@ import asyncio
 from collections.abc import Awaitable, Iterable
 from typing import TypeVar
 
-from httpx import (
-    CloseError,
-    ConnectError,
-    ConnectTimeout,
-    NetworkError,
-    ReadError,
-    ReadTimeout,
-    RemoteProtocolError,
-)
-from requests.exceptions import RequestException, Timeout
-from tenacity import retry_if_exception_type
 from tqdm.asyncio import tqdm
 
 T = TypeVar("T")
 
 
-_BASE_CONNECTION_ERRORS = (
-    # From requests
-    Timeout,
-    ConnectionError,
-    RequestException,
-    # From httpx
-    ConnectError,
-    ConnectTimeout,
-    ReadTimeout,
-    ReadError,
-    NetworkError,
-    RemoteProtocolError,
-    CloseError,
-)
-
-retry_if_connection_error = retry_if_exception_type(_BASE_CONNECTION_ERRORS)
-
-
-def create_retry_if_connection_error(*additional_exceptions):
-    """Create a retry condition with base connection errors plus additional exceptions."""
-    return retry_if_exception_type(_BASE_CONNECTION_ERRORS + additional_exceptions)
-
-
 async def gather_with_concurrency(
     n: int | asyncio.Semaphore, coros: Iterable[Awaitable[T]], progress: bool = False
 ) -> list[T]:

futurehouse_client/utils/world_model_tools.py

@@ -46,16 +46,17 @@ class WorldModelTools:
         return WorldModelTools._get_client().create_world_model(world_model)
 
     @staticmethod
-    def search_world_models(query: str) -> list[str]:
+    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=1)
+        return WorldModelTools._get_client().search_world_models(query, size=size)
 
 
 create_world_model_tool = Tool.from_function(WorldModelTools.create_world_model)

futurehouse_client/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ 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.1.dev95'
-__version_tuple__ = version_tuple = (0, 4, 1, 'dev95')
+__version__ = version = '0.4.2.dev11'
+__version_tuple__ = version_tuple = (0, 4, 2, 'dev11')
+
+__commit_id__ = commit_id = None

{futurehouse_client-0.4.1.dev95.dist-info → futurehouse_client-0.4.2.dev11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.1.dev95
+Version: 0.4.2.dev11
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License
@@ -213,22 +213,18 @@ Classifier: Programming Language :: Python
 Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiofiles
 Requires-Dist: cloudpickle
 Requires-Dist: fhaviary
-Requires-Dist: google-resumable-media[aiohttp]
 Requires-Dist: httpx
 Requires-Dist: ldp>=0.22.0
 Requires-Dist: litellm
 Requires-Dist: pydantic
 Requires-Dist: python-dotenv
-Requires-Dist: requests
 Requires-Dist: tenacity
 Requires-Dist: tqdm>=4.62
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: futurehouse-client[monitoring,typing]; extra == "dev"
-Requires-Dist: ipykernel; extra == "dev"
 Requires-Dist: jupyter; extra == "dev"
 Requires-Dist: jupyterlab; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
@@ -248,7 +244,6 @@ Requires-Dist: setuptools_scm; extra == "dev"
 Provides-Extra: monitoring
 Requires-Dist: newrelic>=8.8.0; extra == "monitoring"
 Provides-Extra: typing
-Requires-Dist: types-PyYAML; extra == "typing"
 Requires-Dist: types-requests; extra == "typing"
 Requires-Dist: types-tqdm; extra == "typing"
 Dynamic: license-file

futurehouse_client-0.4.2.dev11.dist-info/RECORD

@@ -0,0 +1,21 @@
+futurehouse_client/__init__.py,sha256=PvFTkocA-hobsWoDEBEdrUgLIbuVbDs_0nvMdImJmHk,707
+futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+futurehouse_client/version.py,sha256=c_JzNS0ouORBU9NbAiOBOJBqK2VWGvvGLFYyQtq8WEs,719
+futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
+futurehouse_client/clients/job_client.py,sha256=D51_qTxya6g5Wfg_ZfJdP031TV_YDJeXkGMiYAJ1qRc,11962
+futurehouse_client/clients/rest_client.py,sha256=OsdskJ1OT8SdDJQHG4bbt2_sVZMpHMtbG_x78cdV8ac,99790
+futurehouse_client/models/__init__.py,sha256=kQ4R7VEuRxO0IQEW_sk9CndBL7zzl8rUKI24ddyYLM0,647
+futurehouse_client/models/app.py,sha256=UUg17I3zk6cH_7mrdojHGYvQfm_SeDkuUxsPlRyIYz0,31895
+futurehouse_client/models/client.py,sha256=WFD1ddR0O7nD1ErqcJ-kt_miIW22KP6IDOSkaSdVZ8M,1716
+futurehouse_client/models/rest.py,sha256=ybelLsyTsKYud7DYUCF0sFF6u81bl8WmS_wWAnbX-0M,3382
+futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+futurehouse_client/utils/auth.py,sha256=tgWELjKfg8eWme_qdcRmc8TjQN9DVZuHHaVXZNHLchk,2960
+futurehouse_client/utils/general.py,sha256=A_rtTiYW30ELGEZlWCIArO7q1nEmqi8hUlmBRYkMQ_c,767
+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=Ctiy-EfK7EXrjmKO_nI6V5VhOJyHKWc0sKwa8Q0HAAo,2292
+futurehouse_client-0.4.2.dev11.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
+futurehouse_client-0.4.2.dev11.dist-info/METADATA,sha256=xb_dj1oOZU-vjhdpMUnRrlLzbqfkaJCA-ZNa4PUE2LQ,26803
+futurehouse_client-0.4.2.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+futurehouse_client-0.4.2.dev11.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.4.2.dev11.dist-info/RECORD,,