futurehouse-client 0.4.3.dev4__tar.gz → 0.4.4.dev1__tar.gz

{futurehouse_client-0.4.3.dev4/futurehouse_client.egg-info → futurehouse_client-0.4.4.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.3.dev4
+Version: 0.4.4.dev1
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: aiofiles
 Requires-Dist: cloudpickle
 Requires-Dist: fhaviary
-Requires-Dist: google-resumable-media[aiohttp]
+Requires-Dist: google-resumable-media
 Requires-Dist: httpx
 Requires-Dist: ldp>=0.22.0
 Requires-Dist: litellm

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1}/docs/client_notebook.ipynb

@@ -25,14 +25,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from ldp.agent import AgentConfig\n",
+    "\n",
     "from futurehouse_client import FutureHouseClient, JobNames\n",
     "from futurehouse_client.models import (\n",
     "    AuthType,\n",
     "    RuntimeConfig,\n",
     "    Stage,\n",
     "    TaskRequest,\n",
-    ")\n",
-    "from ldp.agent import AgentConfig"
+    ")"
    ]
   },
   {

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "aiofiles",
     "cloudpickle",
     "fhaviary",
-    "google-resumable-media[aiohttp]",
+    "google-resumable-media",
     "httpx",
     "ldp>=0.22.0",
     "litellm",
@@ -70,13 +70,16 @@ typing = [
     "types-tqdm",
 ]
 
+[tool.ruff]
+extend = "../../pyproject.toml"
+
 [tool.setuptools.packages.find]
-include = ["futurehouse_client*"]
+where = ["src"]
 
 [tool.setuptools_scm]
 local_scheme = "no-local-version"
 root = "../.."
-version_file = "futurehouse_client/version.py"
+version_file = "src/futurehouse_client/version.py"
 
 [[tool.uv.index]]
 explicit = true

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1/src}/futurehouse_client/clients/data_storage_methods.py

@@ -476,7 +476,7 @@ class ProgressWrapper:
         return self.file_obj.tell()
 
 
-class DataStorageMethods:  # pylint: disable=too-many-public-methods
+class DataStorageMethods:
     """Data storage methods for RestClient.
 
     This class contains methods for interacting with the data storage API endpoints.
@@ -1638,13 +1638,13 @@ class DataStorageMethods:  # pylint: disable=too-many-public-methods
             existing_location = DataStorageLocationPayload(
                 storage_type=DataStorageType.LINK,
                 content_type=DataContentType.TEXT,
-                location=url,
+                location=str(url),
                 metadata=link_metadata or None,
             )
 
             payload = DataStorageRequestPayload(
                 name=name,
-                content=url,
+                content=str(url),
                 description=description,
                 dataset_id=dataset_id,
                 project_id=project_id,
@@ -1697,13 +1697,13 @@ class DataStorageMethods:  # pylint: disable=too-many-public-methods
             existing_location = DataStorageLocationPayload(
                 storage_type=DataStorageType.LINK,
                 content_type=DataContentType.TEXT,
-                location=url,
+                location=str(url),
                 metadata=link_metadata or None,
             )
 
             payload = DataStorageRequestPayload(
                 name=name,
-                content=url,
+                content=str(url),
                 description=description,
                 dataset_id=dataset_id,
                 project_id=project_id,

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1/src}/futurehouse_client/clients/rest_client.py

@@ -165,7 +165,6 @@ retry_if_connection_error = create_retry_if_connection_error(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

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1/src}/futurehouse_client/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.3.dev4'
-__version_tuple__ = version_tuple = (0, 4, 3, 'dev4')
+__version__ = version = '0.4.4.dev1'
+__version_tuple__ = version_tuple = (0, 4, 4, 'dev1')
 
-__commit_id__ = commit_id = 'g897126b18'
+__commit_id__ = commit_id = 'g254eff27c'

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1/src/futurehouse_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.3.dev4
+Version: 0.4.4.dev1
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: aiofiles
 Requires-Dist: cloudpickle
 Requires-Dist: fhaviary
-Requires-Dist: google-resumable-media[aiohttp]
+Requires-Dist: google-resumable-media
 Requires-Dist: httpx
 Requires-Dist: ldp>=0.22.0
 Requires-Dist: litellm

futurehouse_client-0.4.4.dev1/src/futurehouse_client.egg-info/SOURCES.txt

@@ -0,0 +1,36 @@
+LICENSE
+README.md
+data_storage.md
+pyproject.toml
+docs/__init__.py
+docs/client_notebook.ipynb
+src/futurehouse_client/__init__.py
+src/futurehouse_client/py.typed
+src/futurehouse_client/version.py
+src/futurehouse_client.egg-info/PKG-INFO
+src/futurehouse_client.egg-info/SOURCES.txt
+src/futurehouse_client.egg-info/dependency_links.txt
+src/futurehouse_client.egg-info/requires.txt
+src/futurehouse_client.egg-info/top_level.txt
+src/futurehouse_client/clients/__init__.py
+src/futurehouse_client/clients/data_storage_methods.py
+src/futurehouse_client/clients/job_client.py
+src/futurehouse_client/clients/rest_client.py
+src/futurehouse_client/models/__init__.py
+src/futurehouse_client/models/app.py
+src/futurehouse_client/models/client.py
+src/futurehouse_client/models/data_storage_methods.py
+src/futurehouse_client/models/rest.py
+src/futurehouse_client/utils/__init__.py
+src/futurehouse_client/utils/auth.py
+src/futurehouse_client/utils/general.py
+src/futurehouse_client/utils/module_utils.py
+src/futurehouse_client/utils/monitoring.py
+src/futurehouse_client/utils/world_model_tools.py
+tests/test_client.py
+tests/test_data_storage_e2e.py
+tests/test_data_storage_methods.py
+tests/test_rest.py
+tests/test_data/test_file.txt
+tests/test_data/test_information.txt
+tests/test_data/test_manifest.yaml

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1/src}/futurehouse_client.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiofiles
 cloudpickle
 fhaviary
-google-resumable-media[aiohttp]
+google-resumable-media
 httpx
 ldp>=0.22.0
 litellm

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1}/tests/test_client.py

@@ -5,12 +5,13 @@ from unittest.mock import MagicMock
 
 import httpx
 import pytest
+
 from futurehouse_client.models.app import AuthType, TaskResponse
 from futurehouse_client.utils.auth import RefreshingJWT
 
 
-@pytest.fixture
-def mock_client():
+@pytest.fixture(name="mock_client")
+def fixture_mock_client():
     """Create a mock synchronous HTTP client that returns success on first auth attempt."""
     client = MagicMock(spec=httpx.Client)
     response = MagicMock()
@@ -23,8 +24,8 @@ def mock_client():
     return client
 
 
-@pytest.fixture
-def failing_then_success_client():
+@pytest.fixture(name="failing_then_success_client")
+def fixture_failing_then_success_client():
     """Create a client that fails with 401 on first call, then succeeds on retry."""
     client = MagicMock(spec=httpx.Client)
 

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1}/tests/test_data_storage_e2e.py

@@ -4,6 +4,8 @@ from pathlib import Path
 from uuid import uuid4
 
 import pytest
+from pydantic import HttpUrl
+
 from futurehouse_client.clients.data_storage_methods import DataStorageError
 from futurehouse_client.clients.rest_client import (
     RestClient,
@@ -20,8 +22,8 @@ from futurehouse_client.models.data_storage_methods import (
 ADMIN_API_KEY = os.environ["PLAYWRIGHT_ADMIN_API_KEY"]
 
 
-@pytest.fixture
-def admin_client():
+@pytest.fixture(name="admin_client")
+def fixture_admin_client():
     """Create a RestClient for testing; using a admin user key with full access."""
     return RestClient(
         stage=Stage.DEV,
@@ -482,3 +484,26 @@ def test_dataset_sync(admin_client: RestClient):
 
     with pytest.raises(DataStorageError, match="Failed to get dataset"):
         admin_client.get_dataset(dataset_id=create_response.id)
+
+
+@pytest.mark.asyncio
+async def test_astore_link_success(admin_client: RestClient):
+    """Test successful asynchronous link storage."""
+    result = await admin_client.astore_link(
+        name="Test API Link",
+        url=HttpUrl("https://xyz.api.futurehouse.org"),
+        description="Test link to xyz.api.futurehouse.org",
+        instructions="this is a test api which you can call without authentication",
+        api_key="test_key_123",
+    )
+
+    assert result.data_storage.id is not None
+    assert result.data_storage.name == "Test API Link"
+    assert result.data_storage.description == "Test link to xyz.api.futurehouse.org"
+    assert result.data_storage.content == "https://xyz.api.futurehouse.org/"
+    assert len(result.storage_locations) > 0
+    assert result.storage_locations[0].storage_config.storage_type == "link"
+    assert (
+        result.storage_locations[0].storage_config.location
+        == "https://xyz.api.futurehouse.org/"
+    )

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1}/tests/test_data_storage_methods.py

@@ -7,6 +7,8 @@ from unittest.mock import ANY, AsyncMock, Mock, patch
 from uuid import uuid4
 
 import pytest
+from httpx import HTTPStatusError, codes
+
 from futurehouse_client.clients.data_storage_methods import (
     DataStorageCreationError,
     DataStorageError,
@@ -21,8 +23,6 @@ from futurehouse_client.models.data_storage_methods import (
     DirectoryManifest,
     ManifestEntry,
 )
-from httpx import HTTPStatusError, codes
-from pydantic import HttpUrl
 
 
 class MockDataStorageMethods(DataStorageMethods):
@@ -1232,27 +1232,6 @@ class TestDataStorageMethods:
         with pytest.raises(DataStorageError, match="Data storage entry not found"):
             await self.methods.adelete_data_storage_entry(entry_id)
 
-    @pytest.mark.asyncio
-    async def test_astore_link_success(self):
-        result = await self.methods.astore_link(
-            name="Test API Link",
-            url=HttpUrl("https://xyz.api.futurehouse.org"),
-            description="Test link to xyz.api.futurehouse.org",
-            instructions="this is a test api which you can call without authentication",
-            api_key="test_key_123",
-        )
-
-        assert result.data_storage.id is not None
-        assert result.data_storage.name == "Test API Link"
-        assert result.data_storage.description == "Test link to xyz.api.futurehouse.org"
-        assert result.data_storage.content == "https://xyz.api.futurehouse.org"
-        assert len(result.storage_locations) > 0
-        assert result.storage_locations[0].storage_config.storage_type == "link"
-        assert (
-            result.storage_locations[0].storage_config.location
-            == "https://xyz.api.futurehouse.org"
-        )
-
 
 class TestUtilityFunctions:
     """Test cases for utility functions."""

{futurehouse_client-0.4.3.dev4 → futurehouse_client-0.4.4.dev1}/tests/test_rest.py

@@ -1,6 +1,6 @@
 # ruff: noqa: ARG001
-# ruff:  noqa: SIM117
-# pylint: disable=too-many-lines,import-error,too-many-public-methods
+# ruff: noqa: SIM117
+
 import asyncio
 import os
 import tempfile
@@ -12,6 +12,19 @@ from unittest.mock import MagicMock, Mock, mock_open, patch
 from uuid import UUID, uuid4
 
 import pytest
+from httpx import (
+    CloseError,
+    ConnectError,
+    ConnectTimeout,
+    HTTPStatusError,
+    NetworkError,
+    ReadError,
+    ReadTimeout,
+    RemoteProtocolError,
+)
+from pytest_subtests import SubTests
+from requests.exceptions import RequestException, Timeout
+
 from futurehouse_client.clients import (
     JobNames,
 )
@@ -38,26 +51,14 @@ from futurehouse_client.models.rest import (
     WorldModel,
 )
 from futurehouse_client.utils.general import create_retry_if_connection_error
-from httpx import (
-    CloseError,
-    ConnectError,
-    ConnectTimeout,
-    HTTPStatusError,
-    NetworkError,
-    ReadError,
-    ReadTimeout,
-    RemoteProtocolError,
-)
-from pytest_subtests import SubTests
-from requests.exceptions import RequestException, Timeout
 
 ADMIN_API_KEY = os.environ.get("PLAYWRIGHT_ADMIN_API_KEY", "")
 PUBLIC_API_KEY = os.environ.get("PLAYWRIGHT_PUBLIC_API_KEY", "")
 TEST_MAX_POLLS = 100
 
 
-@pytest.fixture
-def admin_client():
+@pytest.fixture(name="admin_client")
+def fixture_admin_client():
     """Create a RestClient for testing; using an admin key."""
     return RestClient(
         stage=Stage.DEV,
@@ -65,8 +66,8 @@ def admin_client():
     )
 
 
-@pytest.fixture
-def pub_client():
+@pytest.fixture(name="pub_client")
+def fixture_pub_client():
     """Create a RestClient for testing; using a public user key with limited access."""
     return RestClient(
         stage=Stage.DEV,
@@ -74,8 +75,8 @@ def pub_client():
     )
 
 
-@pytest.fixture
-def task_req():
+@pytest.fixture(name="task_req")
+def fixture_task_req():
     """Create a sample task request."""
     return TaskRequest(
         name=JobNames.from_string("dummy"),
@@ -83,24 +84,26 @@ def task_req():
     )
 
 
-@pytest.fixture
-def pqa_task_req():
+@pytest.fixture(name="pqa_task_req")
+def fixture_pqa_task_req():
     return TaskRequest(
         name=JobNames.from_string("crow"),
         query="How many moons does earth have?",
     )
 
 
-@pytest.fixture
-def phoenix_task_req():
+@pytest.fixture(name="phoenix_task_req")
+def fixture_phoenix_task_req():
     return TaskRequest(
         name=JobNames.from_string("phoenix"),
         query="What is the molecular weight of ascorbic acids?",
     )
 
 
-@pytest.fixture
-def running_trajectory_id(admin_client: RestClient, task_req: TaskRequest) -> str:
+@pytest.fixture(name="running_trajectory_id")
+def fixture_running_trajectory_id(
+    admin_client: RestClient, task_req: TaskRequest
+) -> str:
     return admin_client.create_task(task_req)
 
 

futurehouse_client-0.4.3.dev4/futurehouse_client.egg-info/SOURCES.txt

@@ -1,36 +0,0 @@
-LICENSE
-README.md
-data_storage.md
-pyproject.toml
-docs/__init__.py
-docs/client_notebook.ipynb
-futurehouse_client/__init__.py
-futurehouse_client/py.typed
-futurehouse_client/version.py
-futurehouse_client.egg-info/PKG-INFO
-futurehouse_client.egg-info/SOURCES.txt
-futurehouse_client.egg-info/dependency_links.txt
-futurehouse_client.egg-info/requires.txt
-futurehouse_client.egg-info/top_level.txt
-futurehouse_client/clients/__init__.py
-futurehouse_client/clients/data_storage_methods.py
-futurehouse_client/clients/job_client.py
-futurehouse_client/clients/rest_client.py
-futurehouse_client/models/__init__.py
-futurehouse_client/models/app.py
-futurehouse_client/models/client.py
-futurehouse_client/models/data_storage_methods.py
-futurehouse_client/models/rest.py
-futurehouse_client/utils/__init__.py
-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_data_storage_e2e.py
-tests/test_data_storage_methods.py
-tests/test_rest.py
-tests/test_data/test_file.txt
-tests/test_data/test_information.txt
-tests/test_data/test_manifest.yaml