docent-python 0.1.0a1__py3-none-any.whl → 0.1.0a3__py3-none-any.whl

docent/data_models/__init__.py

@@ -1,11 +1,5 @@
 from docent.data_models.agent_run import AgentRun
 from docent.data_models.citation import Citation
-from docent.data_models.filters import (
-    AgentRunIdFilter,
-    BaseFrameFilter,
-    ComplexFilter,
-    SearchResultPredicateFilter,
-)
 from docent.data_models.metadata import BaseAgentRunMetadata, BaseMetadata, FrameDimension
 from docent.data_models.regex import RegexSnippet
 from docent.data_models.transcript import Transcript
@@ -14,11 +8,7 @@ __all__ = [
     "AgentRun",
     "Citation",
     "RegexSnippet",
-    "AgentRunIdFilter",
     "FrameDimension",
-    "BaseFrameFilter",
-    "SearchResultPredicateFilter",
-    "ComplexFilter",
     "BaseAgentRunMetadata",
     "BaseMetadata",
     "Transcript",

docent/sdk/client.py

@@ -5,7 +5,6 @@ import requests
 
 from docent._log_util.logger import get_logger
 from docent.data_models.agent_run import AgentRun
-from docent.data_models.filters import FrameFilter
 
 logger = get_logger(__name__)
 
@@ -24,7 +23,11 @@ class Docent:
     """
 
     def __init__(
-        self, server_url: str, web_url: str, email: str | None = None, password: str | None = None
+        self,
+        server_url: str = "https://aws-docent-backend.transluce.org",
+        web_url: str = "https://aws-docent.transluce.org",
+        email: str | None = None,
+        password: str | None = None,
     ):
         self._server_url = server_url.rstrip("/") + "/rest"
         self._web_url = web_url.rstrip("/")
@@ -177,53 +180,6 @@ class Docent:
         logger.info(f"Successfully added {total_runs} agent runs to FrameGrid '{fg_id}'")
         return {"status": "success", "total_runs_added": total_runs}
 
-    def get_base_filter(self, fg_id: str) -> dict[str, Any] | None:
-        """Retrieves the base filter for a FrameGrid.
-
-        The base filter defines default filtering applied to all views.
-
-        Args:
-            fg_id: ID of the FrameGrid.
-
-        Returns:
-            dict or None: Filter data if a filter exists, None otherwise.
-
-        Raises:
-            requests.exceptions.HTTPError: If the API request fails.
-        """
-        url = f"{self._server_url}/{fg_id}/base_filter"
-        response = self._session.get(url)
-        response.raise_for_status()
-        # The endpoint returns the filter model directly or null
-        filter_data = response.json()
-        return filter_data
-
-    def set_base_filter(self, fg_id: str, filter: FrameFilter | None) -> dict[str, Any]:
-        """Sets the base filter for a FrameGrid.
-
-        The base filter defines default filtering applied to all views.
-
-        Args:
-            fg_id: ID of the FrameGrid.
-            filter: FrameFilter object defining the filter, or None to clear the filter.
-
-        Returns:
-            dict: API response data.
-
-        Raises:
-            requests.exceptions.HTTPError: If the API request fails.
-        """
-        url = f"{self._server_url}/{fg_id}/base_filter"
-        payload = {
-            "filter": filter.model_dump() if filter else None,
-        }
-
-        response = self._session.post(url, json=payload)
-        response.raise_for_status()
-
-        logger.info(f"Successfully set base filter for FrameGrid '{fg_id}'")
-        return response.json()
-
     def list_framegrids(self) -> list[dict[str, Any]]:
         """Lists all available FrameGrids.
 

{docent_python-0.1.0a1.dist-info → docent_python-0.1.0a3.dist-info}/METADATA

@@ -1,16 +1,14 @@
 Metadata-Version: 2.4
 Name: docent-python
-Version: 0.1.0a1
+Version: 0.1.0a3
 Summary: Docent SDK
 Project-URL: Homepage, https://github.com/TransluceAI/docent
 Project-URL: Issues, https://github.com/TransluceAI/docent/issues
 Project-URL: Docs, https://transluce-docent.readthedocs-hosted.com/en/latest
-Author-email: Transluce AI <info@transluce.org>
+Author-email: Transluce <info@transluce.org>
 License-Expression: MIT
 License-File: LICENSE.md
 Requires-Python: >=3.11
-Requires-Dist: logging>=0.4.9.6
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: sqlalchemy>=2.0.41
 Requires-Dist: tiktoken>=0.7.0

{docent_python-0.1.0a1.dist-info → docent_python-0.1.0a3.dist-info}/RECORD

@@ -2,11 +2,10 @@ docent/__init__.py,sha256=J2BbO6rzilfw9WXRUeolr439EGFezqbMU_kCpCCryRA,59
 docent/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docent/_log_util/__init__.py,sha256=3HXXrxrSm8PxwG4llotrCnSnp7GuroK1FNHsdg6f7aE,73
 docent/_log_util/logger.py,sha256=kwM0yRW1IJd6-XTorjWn48B4l8qvD2ZM6VDjY5eskQI,4422
-docent/data_models/__init__.py,sha256=M84x4yoPZz97-e-2KQ4qXud8i6Ykdjl1ChbwZalu2NQ,689
+docent/data_models/__init__.py,sha256=SbXBXpI2HLI2qeGoKD-6Qp0gY3igQAw6qOsolc_rj7Q,448
 docent/data_models/_tiktoken_util.py,sha256=hC0EDDWItv5-0cONBnHWgZtQOflDU7ZNEhXPFo4DvPc,3057
 docent/data_models/agent_run.py,sha256=sdvoUUpOhQAHqJHNR5KoHthCXrpJajdIREMacoR1ODk,9516
 docent/data_models/citation.py,sha256=WsVQZcBT2EJD24ysyeVOC5Xfo165RI7P5_cOnJBgHj0,10015
-docent/data_models/filters.py,sha256=nZquRQji_xZwea6nBxM_SRECaYECDMEQ8Zt1TXl-_jI,7484
 docent/data_models/metadata.py,sha256=yBEm5M_gSNuoG---Fezsjm0YDGUQoJeM_BL9rwbBt-U,8035
 docent/data_models/regex.py,sha256=0ciIerkrNwb91bY5mTcyO5nDWH67xx2tZYObV52fmBo,1684
 docent/data_models/shared_types.py,sha256=jjm-Dh5S6v7UKInW7SEqoziOsx6Z7Uu4e3VzgCbTWvc,225
@@ -16,8 +15,8 @@ docent/data_models/chat/content.py,sha256=Co-jO8frQa_DSP11wJuhPX0s-GpJk8yqtKqPei
 docent/data_models/chat/message.py,sha256=iAo38kbV6wYbFh8S23cxLy6HY4C_i3PzQ6RpSQG5dxM,3861
 docent/data_models/chat/tool.py,sha256=x7NKINswPe0Kqvcx4ubjHzB-n0-i4DbFodvaBb2vitk,3042
 docent/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-docent/sdk/client.py,sha256=XoeO8d7vCghf0WZoc22lJdPRBt6i88S2QV-viQubuEA,10090
-docent_python-0.1.0a1.dist-info/METADATA,sha256=NewmZvefKjD0vLDEHpc_VRf4v-asf_jf9DEEsVG2xmw,562
-docent_python-0.1.0a1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-docent_python-0.1.0a1.dist-info/licenses/LICENSE.md,sha256=-TCY5GNyVAczrb96jTgTPalccQeyZqVXgs0N_dhC1OI,1086
-docent_python-0.1.0a1.dist-info/RECORD,,
+docent/sdk/client.py,sha256=J6xd100KWym-jOrXjaEyagi85ddklymF9QEOJmYxJP8,8588
+docent_python-0.1.0a3.dist-info/METADATA,sha256=v_-KmR9urNIEdjduRZ_wzZXpplPvImgT--y_QKgGHAI,493
+docent_python-0.1.0a3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+docent_python-0.1.0a3.dist-info/licenses/LICENSE.md,sha256=vOHzq3K4Ndu0UV9hPrtXvlD7pHOjyDQmGjHuLSIkRQY,1087
+docent_python-0.1.0a3.dist-info/RECORD,,

{docent_python-0.1.0a1.dist-info → docent_python-0.1.0a3.dist-info}/licenses/LICENSE.md

@@ -4,4 +4,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

docent/data_models/filters.py

@@ -1,205 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Annotated, Any, Literal, Type, Union
-from uuid import uuid4
-
-from pydantic import BaseModel, Discriminator, Field, field_validator
-from sqlalchemy import ColumnElement, and_, or_
-
-from docent._log_util import get_logger
-
-if TYPE_CHECKING:
-    from docent_core._db_service.schemas.tables import SQLAAgentRun
-
-logger = get_logger(__name__)
-
-
-class BaseFrameFilter(BaseModel):
-    """Base class for all frame filters."""
-
-    id: str = Field(default_factory=lambda: str(uuid4()))
-    name: str | None = None
-    supports_sql: bool = True  # All filters must support SQL
-
-    def to_sqla_where_clause(self, table: Type["SQLAAgentRun"]) -> ColumnElement[bool] | None:
-        """Convert this filter to a SQLAlchemy WHERE clause.
-
-        All filters must implement this method to support SQL execution.
-        """
-        raise NotImplementedError(
-            f"Filter {self.__class__.__name__} must implement to_sqla_where_clause"
-        )
-
-
-class PrimitiveFilter(BaseFrameFilter):
-    """Filter that applies a primitive operation to a metadata field."""
-
-    type: Literal["primitive"] = "primitive"
-    key_path: list[str]
-    value: Any
-    op: Literal[">", ">=", "<", "<=", "==", "!=", "~*", "!~*"]
-
-    def to_sqla_where_clause(self, table: Type["SQLAAgentRun"]) -> ColumnElement[bool] | None:
-        """Convert this filter to a SQLAlchemy WHERE clause."""
-
-        mode = self.key_path[0]
-
-        # Extract value from JSONB using the table parameter
-        if mode == "text":
-            sqla_value = table.text_for_search  # type: ignore
-        elif mode == "metadata":
-            sqla_value = table.metadata_json  # type: ignore
-        else:
-            raise ValueError(f"Unsupported mode: {mode}")
-
-        for key in self.key_path[1:]:
-            sqla_value = sqla_value[key]
-
-        # Cast the extracted value to the correct type
-        # This is only necessary for metadata which is JSONB
-        if mode == "metadata":
-            if isinstance(self.value, str):
-                sqla_value = sqla_value.as_string()
-            elif isinstance(self.value, bool):
-                sqla_value = sqla_value.as_boolean()
-            elif isinstance(self.value, float) or isinstance(self.value, int):  # type: ignore warning about unnecessary comparison
-                # if self.value is an int, we may still need to do sql comparisons with floats
-                sqla_value = sqla_value.as_float()
-            else:
-                raise ValueError(f"Unsupported value type: {type(self.value)}")
-
-        # Handle different operations using SQLAlchemy expressions
-        if self.op == "==":
-            return sqla_value == self.value
-        elif self.op == "!=":
-            return sqla_value != self.value
-        elif self.op == ">":
-            return sqla_value > self.value
-        elif self.op == ">=":
-            return sqla_value >= self.value
-        elif self.op == "<":
-            return sqla_value < self.value
-        elif self.op == "<=":
-            return sqla_value <= self.value
-        elif self.op == "~*":
-            return sqla_value.op("~*")(self.value)
-        else:
-            raise ValueError(f"Unsupported operation: {self.op}")
-
-
-class ComplexFilter(BaseFrameFilter):
-    """Filter that combines multiple filters with AND/OR/NOT logic."""
-
-    type: Literal["complex"] = "complex"
-    filters: list[FrameFilter]
-    op: Literal["and", "or"] = "and"
-
-    @field_validator("filters")
-    @classmethod
-    def validate_filters(cls, v: list[FrameFilter]) -> list[FrameFilter]:
-        if not v:
-            raise ValueError("ComplexFilter must have at least one filter")
-        return v
-
-    def to_sqla_where_clause(self, table: Type["SQLAAgentRun"]) -> ColumnElement[bool] | None:
-        """Convert this filter to a SQLAlchemy WHERE clause."""
-
-        # Get WHERE clauses for all sub-filters
-        where_clauses: list[ColumnElement[bool]] = []
-        for filter_obj in self.filters:
-            where_clause = filter_obj.to_sqla_where_clause(table)
-            if where_clause is not None:
-                where_clauses.append(where_clause)
-
-        if not where_clauses:
-            return None
-
-        # Apply the operation
-        if self.op == "and":
-            result = and_(*where_clauses)
-        elif self.op == "or":
-            result = or_(*where_clauses)
-        else:
-            raise ValueError(f"Unsupported operation: {self.op}")
-
-        return result
-
-
-class AgentRunIdFilter(BaseFrameFilter):
-    """Filter that matches specific agent run IDs."""
-
-    type: Literal["agent_run_id"] = "agent_run_id"
-    agent_run_ids: list[str]
-
-    @field_validator("agent_run_ids")
-    @classmethod
-    def validate_agent_run_ids(cls, v: list[str]) -> list[str]:
-        if not v:
-            raise ValueError("AgentRunIdFilter must have at least one agent run ID")
-        return v
-
-    def to_sqla_where_clause(self, table: Type["SQLAAgentRun"]) -> ColumnElement[bool] | None:
-        """Convert to SQLAlchemy WHERE clause for agent run ID filtering."""
-        return table.id.in_(self.agent_run_ids)
-
-
-class SearchResultPredicateFilter(BaseFrameFilter):
-    """Filter that applies a predicate to search results."""
-
-    type: Literal["search_result_predicate"] = "search_result_predicate"
-    predicate: str
-    search_query: str
-
-    def to_sqla_where_clause(self, table: Type["SQLAAgentRun"]) -> ColumnElement[bool] | None:
-        """Convert to SQLAlchemy WHERE clause for search result filtering."""
-        # This filter requires joining with search results table
-        # For now, we'll return None to indicate it needs special handling
-        # In practice, this would join with the search_results table
-        return None
-
-
-class SearchResultExistsFilter(BaseFrameFilter):
-    """Filter that checks if search results exist."""
-
-    type: Literal["search_result_exists"] = "search_result_exists"
-    search_query: str
-
-    def to_sqla_where_clause(self, table: Type["SQLAAgentRun"]) -> ColumnElement[bool] | None:
-        """Convert to SQLAlchemy WHERE clause for search result existence filtering."""
-        # This filter requires joining with search results table
-        # For now, we'll return None to indicate it needs special handling
-        # In practice, this would join with the search_results table
-        return None
-
-
-FrameFilter = Annotated[
-    Union[
-        PrimitiveFilter,
-        ComplexFilter,
-        AgentRunIdFilter,
-        SearchResultPredicateFilter,
-        SearchResultExistsFilter,
-    ],
-    Discriminator("type"),
-]
-
-
-def parse_filter_dict(filter_dict: dict[str, Any]) -> FrameFilter:
-    """Parse a filter dictionary into a FrameFilter object."""
-    filter_type = filter_dict.get("type")
-
-    if filter_type == "primitive":
-        return PrimitiveFilter(**filter_dict)
-    elif filter_type == "complex":
-        # Recursively parse nested filters
-        nested_filters = [parse_filter_dict(f) for f in filter_dict.get("filters", [])]
-        filter_dict["filters"] = nested_filters
-        return ComplexFilter(**filter_dict)
-    elif filter_type == "agent_run_id":
-        return AgentRunIdFilter(**filter_dict)
-    elif filter_type == "search_result_predicate":
-        return SearchResultPredicateFilter(**filter_dict)
-    elif filter_type == "search_result_exists":
-        return SearchResultExistsFilter(**filter_dict)
-    else:
-        raise ValueError(f"Unknown filter type: {filter_type}")