diff --git a/py/cli/command_group.py b/py/cli/command_group.py index 9b7960f9c..6cf8b727f 100644 --- a/py/cli/command_group.py +++ b/py/cli/command_group.py @@ -1,4 +1,3 @@ -# from .main import load_config import json import types from functools import wraps diff --git a/py/cli/commands/config.py b/py/cli/commands/config.py index 7b95d0431..2c371f84c 100644 --- a/py/cli/commands/config.py +++ b/py/cli/commands/config.py @@ -71,9 +71,7 @@ async def reset(): Config._config = configparser.ConfigParser() # Reset the config in memory # Set default values - Config.set_credentials( - "Base URL", {"base_url": "https://api.cloud.sciphi.ai"} - ) + Config.set_credentials("Base URL", {"base_url": "http://localhost:7272"}) console.print( "[green]Successfully reset configuration to defaults[/green]" diff --git a/py/compose.full.yaml b/py/compose.full.yaml index efb38e2a1..23d7065f8 100644 --- a/py/compose.full.yaml +++ b/py/compose.full.yaml @@ -387,6 +387,8 @@ services: condition: service_completed_successfully unstructured: condition: service_healthy + graph_clustering: + condition: service_healthy r2r-dashboard: image: emrgntcmplxty/r2r-dashboard:latest diff --git a/py/core/base/providers/auth.py b/py/core/base/providers/auth.py index b1b5bd744..98efc5eeb 100644 --- a/py/core/base/providers/auth.py +++ b/py/core/base/providers/auth.py @@ -133,7 +133,7 @@ async def _auth_wrapper( return await self._get_default_admin_user() if not auth and not api_key: raise R2RException( - message="No credentials provided", + message="No credentials provided. Create an account at https://app.sciphi.ai and set your API key using `r2r configure key` OR change your base URL to a custom deployment.", status_code=401, ) if auth and api_key: diff --git a/py/core/base/providers/embedding.py b/py/core/base/providers/embedding.py index 60d048115..5a9e5122b 100644 --- a/py/core/base/providers/embedding.py +++ b/py/core/base/providers/embedding.py @@ -30,7 +30,7 @@ class EmbeddingConfig(ProviderConfig): prefixes: Optional[dict[str, str]] = None add_title_as_prefix: bool = True concurrent_request_limit: int = 256 - max_retries: int = 8 + max_retries: int = 3 initial_backoff: float = 1 max_backoff: float = 64.0 quantization_settings: VectorQuantizationSettings = ( diff --git a/py/core/base/providers/llm.py b/py/core/base/providers/llm.py index 66beede8f..f06d79944 100644 --- a/py/core/base/providers/llm.py +++ b/py/core/base/providers/llm.py @@ -23,7 +23,7 @@ class CompletionConfig(ProviderConfig): provider: Optional[str] = None generation_config: GenerationConfig = GenerationConfig() concurrent_request_limit: int = 256 - max_retries: int = 8 + max_retries: int = 3 initial_backoff: float = 1.0 max_backoff: float = 64.0 diff --git a/py/pyproject.toml b/py/pyproject.toml index 587931105..b1450fc86 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "r2r" readme = "README.md" -version = "3.3.19" +version = "3.3.20" description = "SciPhi R2R" authors = ["Owen Colegrove "] diff --git a/py/sdk/async_client.py b/py/sdk/async_client.py index 66f508f29..6fa102c0e 100644 --- a/py/sdk/async_client.py +++ b/py/sdk/async_client.py @@ -29,7 +29,7 @@ class R2RAsyncClient(BaseClient): def __init__( self, base_url: str = "https://api.cloud.sciphi.ai", - prefix: str = "/v2", + prefix: str = "/v3", custom_client=None, timeout: float = 300.0, ): @@ -47,7 +47,7 @@ def __init__( self.users = UsersSDK(self) async def _make_request( - self, method: str, endpoint: str, version: str = "v2", **kwargs + self, method: str, endpoint: str, version: str = "v3", **kwargs ): url = self._get_full_url(endpoint, version) request_args = self._prepare_request_args(endpoint, **kwargs) @@ -70,7 +70,7 @@ async def _make_request( ) from e async def _make_streaming_request( - self, method: str, endpoint: str, version: str = "v2", **kwargs + self, method: str, endpoint: str, version: str = "v3", **kwargs ) -> AsyncGenerator[Any, None]: url = self._get_full_url(endpoint, version) request_args = self._prepare_request_args(endpoint, **kwargs) diff --git a/py/sdk/base/base_client.py b/py/sdk/base/base_client.py index b139053fa..589644ae9 100644 --- a/py/sdk/base/base_client.py +++ b/py/sdk/base/base_client.py @@ -36,7 +36,7 @@ class BaseClient: def __init__( self, base_url: str = "https://api.cloud.sciphi.ai", - prefix: str = "/v2", + prefix: str = "/v3", timeout: float = 300.0, ): self.base_url = base_url @@ -66,7 +66,7 @@ def _ensure_authenticated(self): message="Not authenticated. Please login first.", ) - def _get_full_url(self, endpoint: str, version: str = "v2") -> str: + def _get_full_url(self, endpoint: str, version: str = "v3") -> str: return f"{self.base_url}/{version}/{endpoint}" def _prepare_request_args(self, endpoint: str, **kwargs) -> dict: