lambdadb 0.3.5__py3-none-any.whl → 0.4.0__py3-none-any.whl

lambdadb/models/deletedocsop.py

@@ -4,22 +4,14 @@ from __future__ import annotations
 from lambdadb.types import BaseModel
 from lambdadb.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 import pydantic
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class FilterTypedDict(TypedDict):
-    r"""Query filter."""
-
-
-class Filter(BaseModel):
-    r"""Query filter."""
-
-
 class DeleteDocsRequestBodyTypedDict(TypedDict):
     ids: NotRequired[List[str]]
     r"""A list of document IDs."""
-    filter_: NotRequired[FilterTypedDict]
+    filter_: NotRequired[Dict[str, Any]]
     r"""Query filter."""
 
 
@@ -27,26 +19,17 @@ class DeleteDocsRequestBody(BaseModel):
     ids: Optional[List[str]] = None
     r"""A list of document IDs."""
 
-    filter_: Annotated[Optional[Filter], pydantic.Field(alias="filter")] = None
+    filter_: Annotated[Optional[Dict[str, Any]], pydantic.Field(alias="filter")] = None
     r"""Query filter."""
 
 
 class DeleteDocsRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
     request_body: DeleteDocsRequestBodyTypedDict
 
 
 class DeleteDocsRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),

lambdadb/models/fetchdocsop.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from lambdadb.types import BaseModel
 from lambdadb.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 import pydantic
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -33,21 +33,12 @@ class FetchDocsRequestBody(BaseModel):
 
 
 class FetchDocsRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
     request_body: FetchDocsRequestBodyTypedDict
 
 
 class FetchDocsRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),
@@ -61,23 +52,15 @@ class FetchDocsRequest(BaseModel):
     ]
 
 
-class FetchDocsDocDocTypedDict(TypedDict):
-    pass
-
-
-class FetchDocsDocDoc(BaseModel):
-    pass
-
-
 class FetchDocsDocTypedDict(TypedDict):
     collection: str
-    doc: FetchDocsDocDocTypedDict
+    doc: Dict[str, Any]
 
 
 class FetchDocsDoc(BaseModel):
     collection: str
 
-    doc: FetchDocsDocDoc
+    doc: Dict[str, Any]
 
 
 class FetchDocsResponseTypedDict(TypedDict):

lambdadb/models/getbulkupsertdocsop.py

@@ -10,20 +10,11 @@ from typing_extensions import Annotated, NotRequired, TypedDict
 
 
 class GetBulkUpsertDocsRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
 
 
 class GetBulkUpsertDocsRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),

lambdadb/models/getcollectionop.py

@@ -9,20 +9,11 @@ from typing_extensions import Annotated, TypedDict
 
 
 class GetCollectionRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
 
 
 class GetCollectionRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),

lambdadb/models/listcollectionsop.py

@@ -3,24 +3,8 @@
 from __future__ import annotations
 from .collectionresponse import CollectionResponse, CollectionResponseTypedDict
 from lambdadb.types import BaseModel
-from lambdadb.utils import FieldMetadata, PathParamMetadata
-import pydantic
 from typing import List
-from typing_extensions import Annotated, TypedDict
-
-
-class ListCollectionsRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
-
-
-class ListCollectionsRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
+from typing_extensions import TypedDict
 
 
 class ListCollectionsResponseTypedDict(TypedDict):

lambdadb/models/querycollectionop.py

@@ -4,36 +4,20 @@ from __future__ import annotations
 from lambdadb.types import BaseModel
 from lambdadb.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 import pydantic
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class QueryTypedDict(TypedDict):
-    r"""Query object."""
-
-
-class Query(BaseModel):
-    r"""Query object."""
-
-
-class SortTypedDict(TypedDict):
-    pass
-
-
-class Sort(BaseModel):
-    pass
-
-
 class QueryCollectionRequestBodyTypedDict(TypedDict):
     size: int
     r"""Number of documents to return. Note that the maximum number of documents is 100."""
-    query: NotRequired[QueryTypedDict]
+    query: NotRequired[Dict[str, Any]]
     r"""Query object."""
     consistent_read: NotRequired[bool]
     r"""If your application requires a strongly consistent read, set consistentRead to true. Although a strongly consistent read might take more time than an eventually consistent read, it always returns the last updated value."""
     include_vectors: NotRequired[bool]
     r"""If your application need to include vector values in the response, set includeVectors to true."""
-    sort: NotRequired[List[SortTypedDict]]
+    sort: NotRequired[List[Dict[str, Any]]]
     r"""List of field name, sort direction pairs."""
     fields: NotRequired[List[str]]
     r"""List of field name to include in results"""
@@ -43,7 +27,7 @@ class QueryCollectionRequestBody(BaseModel):
     size: int
     r"""Number of documents to return. Note that the maximum number of documents is 100."""
 
-    query: Optional[Query] = None
+    query: Optional[Dict[str, Any]] = None
     r"""Query object."""
 
     consistent_read: Annotated[
@@ -56,7 +40,7 @@ class QueryCollectionRequestBody(BaseModel):
     ] = False
     r"""If your application need to include vector values in the response, set includeVectors to true."""
 
-    sort: Optional[List[Sort]] = None
+    sort: Optional[List[Dict[str, Any]]] = None
     r"""List of field name, sort direction pairs."""
 
     fields: Optional[List[str]] = None
@@ -64,21 +48,12 @@ class QueryCollectionRequestBody(BaseModel):
 
 
 class QueryCollectionRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
     request_body: QueryCollectionRequestBodyTypedDict
 
 
 class QueryCollectionRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),
@@ -92,20 +67,12 @@ class QueryCollectionRequest(BaseModel):
     ]
 
 
-class QueryCollectionDocDocTypedDict(TypedDict):
-    pass
-
-
-class QueryCollectionDocDoc(BaseModel):
-    pass
-
-
 class QueryCollectionDocTypedDict(TypedDict):
     collection: str
     r"""Collection name."""
     score: float
     r"""Document similarity score."""
-    doc: QueryCollectionDocDocTypedDict
+    doc: Dict[str, Any]
 
 
 class QueryCollectionDoc(BaseModel):
@@ -115,7 +82,7 @@ class QueryCollectionDoc(BaseModel):
     score: float
     r"""Document similarity score."""
 
-    doc: QueryCollectionDocDoc
+    doc: Dict[str, Any]
 
 
 class QueryCollectionResponseTypedDict(TypedDict):

lambdadb/models/updatecollectionop.py

@@ -21,21 +21,12 @@ class UpdateCollectionRequestBody(BaseModel):
 
 
 class UpdateCollectionRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
     request_body: UpdateCollectionRequestBodyTypedDict
 
 
 class UpdateCollectionRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),

lambdadb/models/updatedocsop.py

@@ -4,44 +4,27 @@ from __future__ import annotations
 from lambdadb.types import BaseModel
 from lambdadb.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 import pydantic
-from typing import List
+from typing import Any, Dict, List
 from typing_extensions import Annotated, TypedDict
 
 
-class UpdateDocsDocTypedDict(TypedDict):
-    pass
-
-
-class UpdateDocsDoc(BaseModel):
-    pass
-
-
 class UpdateDocsRequestBodyTypedDict(TypedDict):
-    docs: List[UpdateDocsDocTypedDict]
+    docs: List[Dict[str, Any]]
     r"""A list of documents to update. Each document must contain 'id' field to be updated."""
 
 
 class UpdateDocsRequestBody(BaseModel):
-    docs: List[UpdateDocsDoc]
+    docs: List[Dict[str, Any]]
     r"""A list of documents to update. Each document must contain 'id' field to be updated."""
 
 
 class UpdateDocsRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
     request_body: UpdateDocsRequestBodyTypedDict
 
 
 class UpdateDocsRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),

lambdadb/models/upsertdocsop.py

@@ -4,44 +4,27 @@ from __future__ import annotations
 from lambdadb.types import BaseModel
 from lambdadb.utils import FieldMetadata, PathParamMetadata, RequestMetadata
 import pydantic
-from typing import List
+from typing import Any, Dict, List
 from typing_extensions import Annotated, TypedDict
 
 
-class UpsertDocsDocTypedDict(TypedDict):
-    pass
-
-
-class UpsertDocsDoc(BaseModel):
-    pass
-
-
 class UpsertDocsRequestBodyTypedDict(TypedDict):
-    docs: List[UpsertDocsDocTypedDict]
+    docs: List[Dict[str, Any]]
     r"""A list of documents to upsert."""
 
 
 class UpsertDocsRequestBody(BaseModel):
-    docs: List[UpsertDocsDoc]
+    docs: List[Dict[str, Any]]
     r"""A list of documents to upsert."""
 
 
 class UpsertDocsRequestTypedDict(TypedDict):
-    project_name: str
-    r"""Project name."""
     collection_name: str
     r"""Collection name."""
     request_body: UpsertDocsRequestBodyTypedDict
 
 
 class UpsertDocsRequest(BaseModel):
-    project_name: Annotated[
-        str,
-        pydantic.Field(alias="projectName"),
-        FieldMetadata(path=PathParamMetadata(style="simple", explode=False)),
-    ]
-    r"""Project name."""
-
     collection_name: Annotated[
         str,
         pydantic.Field(alias="collectionName"),

lambdadb/sdk.py

@@ -10,7 +10,7 @@ import importlib
 from lambdadb import models, utils
 from lambdadb._hooks import SDKHooks
 from lambdadb.types import OptionalNullable, UNSET
-from typing import Any, Callable, Dict, Optional, TYPE_CHECKING, Union, cast
+from typing import Any, Callable, Dict, List, Optional, TYPE_CHECKING, Union, cast
 import weakref
 
 if TYPE_CHECKING:
@@ -30,6 +30,7 @@ class LambdaDB(BaseSDK):
         project_api_key: Optional[
             Union[Optional[str], Callable[[], Optional[str]]]
         ] = None,
+        base_url: Optional[str] = None,
         server_idx: Optional[int] = None,
         server_url: Optional[str] = None,
         url_params: Optional[Dict[str, str]] = None,
@@ -42,6 +43,7 @@ class LambdaDB(BaseSDK):
         r"""Instantiates the SDK configuring it with the provided parameters.
 
         :param project_api_key: The project_api_key required for authentication
+        :param base_url: Allows setting the baseUrl variable for url substitution
         :param server_idx: The index of the server to use for all methods
         :param server_url: The server URL to use for all methods
         :param url_params: Parameters to optionally template the server URL with
@@ -81,6 +83,11 @@ class LambdaDB(BaseSDK):
         if server_url is not None:
             if url_params is not None:
                 server_url = utils.template_url(server_url, url_params)
+        server_defaults: List[Dict[str, str]] = [
+            {
+                "baseUrl": base_url or "api.lambdadb.com/projects/default",
+            },
+        ]
 
         BaseSDK.__init__(
             self,
@@ -92,6 +99,7 @@ class LambdaDB(BaseSDK):
                 security=security,
                 server_url=server_url,
                 server_idx=server_idx,
+                server_defaults=server_defaults,
                 retry_config=retry_config,
                 timeout_ms=timeout_ms,
                 debug_logger=debug_logger,

lambdadb/sdkconfiguration.py

@@ -8,11 +8,11 @@ from ._version import (
 )
 from .httpclient import AsyncHttpClient, HttpClient
 from .utils import Logger, RetryConfig, remove_suffix
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from lambdadb import models
 from lambdadb.types import OptionalNullable, UNSET
 from pydantic import Field
-from typing import Callable, Dict, Optional, Tuple, Union
+from typing import Callable, Dict, List, Optional, Tuple, Union
 
 
 SERVERS = [
@@ -32,6 +32,7 @@ class SDKConfiguration:
     security: Optional[Union[models.Security, Callable[[], models.Security]]] = None
     server_url: Optional[str] = ""
     server_idx: Optional[int] = 0
+    server_defaults: List[Dict[str, str]] = field(default_factory=List)
     language: str = "python"
     openapi_doc_version: str = __openapi_doc_version__
     sdk_version: str = __version__
@@ -46,4 +47,4 @@ class SDKConfiguration:
         if self.server_idx is None:
             self.server_idx = 0
 
-        return SERVERS[self.server_idx], {}
+        return SERVERS[self.server_idx], self.server_defaults[self.server_idx]

lambdadb/utils/__init__.py

@@ -29,6 +29,7 @@ if TYPE_CHECKING:
         marshal_json,
         unmarshal,
         unmarshal_json,
+        unmarshal_json_response,
         serialize_decimal,
         serialize_float,
         serialize_int,
@@ -98,6 +99,7 @@ __all__ = [
     "template_url",
     "unmarshal",
     "unmarshal_json",
+    "unmarshal_json_response",
     "validate_decimal",
     "validate_const",
     "validate_float",
@@ -152,6 +154,7 @@ _dynamic_imports: dict[str, str] = {
     "template_url": ".url",
     "unmarshal": ".serializers",
     "unmarshal_json": ".serializers",
+    "unmarshal_json_response": ".serializers",
     "validate_decimal": ".serializers",
     "validate_const": ".serializers",
     "validate_float": ".serializers",

lambdadb/utils/serializers.py

@@ -4,7 +4,7 @@ from decimal import Decimal
 import functools
 import json
 import typing
-from typing import Any, Dict, List, Tuple, Union, get_args
+from typing import Any, Dict, List, Optional, Tuple, Union, get_args
 import typing_extensions
 from typing_extensions import get_origin
 
@@ -13,6 +13,7 @@ from pydantic import ConfigDict, create_model
 from pydantic_core import from_json
 
 from ..types.basemodel import BaseModel, Nullable, OptionalNullable, Unset
+from lambdadb import errors
 
 
 def serialize_decimal(as_str: bool):
@@ -140,6 +141,22 @@ def unmarshal_json(raw, typ: Any) -> Any:
     return unmarshal(from_json(raw), typ)
 
 
+def unmarshal_json_response(
+    typ: Any, http_res: httpx.Response, body: Optional[str] = None
+) -> Any:
+    if body is None:
+        body = http_res.text
+    try:
+        return unmarshal_json(body, typ)
+    except Exception as e:
+        raise errors.ResponseValidationError(
+            "Response validation failed",
+            http_res,
+            e,
+            body,
+        ) from e
+
+
 def unmarshal(val, typ: Any) -> Any:
     unmarshaller = create_model(
         "Unmarshaller",
@@ -192,7 +209,9 @@ def is_union(obj: object) -> bool:
     """
     Returns True if the given object is a typing.Union or typing_extensions.Union.
     """
-    return any(obj is typing_obj for typing_obj in _get_typing_objects_by_name_of("Union"))
+    return any(
+        obj is typing_obj for typing_obj in _get_typing_objects_by_name_of("Union")
+    )
 
 
 def stream_to_text(stream: httpx.Response) -> str:
@@ -245,4 +264,3 @@ def _get_typing_objects_by_name_of(name: str) -> Tuple[Any, ...]:
             f"Neither typing nor typing_extensions has an object called {name!r}"
         )
     return result
-