Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

review: cli fixes #273

Merged
merged 4 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions examples/document-search/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@

import asyncio

from ragbits.core import audit
from ragbits.core.embeddings.litellm import LiteLLMEmbeddings
from ragbits.core.vector_stores.in_memory import InMemoryVectorStore
from ragbits.document_search import DocumentSearch
from ragbits.document_search.documents.document import DocumentMeta

audit.set_trace_handlers("cli")

documents = [
DocumentMeta.create_text_document_from_literal(
"""
Expand Down
3 changes: 3 additions & 0 deletions examples/document-search/chroma.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@

from chromadb import EphemeralClient

from ragbits.core import audit
from ragbits.core.embeddings.litellm import LiteLLMEmbeddings, LiteLLMEmbeddingsOptions
from ragbits.core.vector_stores import VectorStoreOptions
from ragbits.core.vector_stores.chroma import ChromaVectorStore
from ragbits.document_search import DocumentSearch, SearchConfig
from ragbits.document_search.documents.document import DocumentMeta

audit.set_trace_handlers("cli")

documents = [
DocumentMeta.create_text_document_from_literal(
"""
Expand Down
109 changes: 0 additions & 109 deletions examples/document-search/chroma_cli.py

This file was deleted.

3 changes: 3 additions & 0 deletions examples/document-search/distributed.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@

import asyncio

from ragbits.core import audit
from ragbits.core.embeddings.litellm import LiteLLMEmbeddings
from ragbits.core.vector_stores.in_memory import InMemoryVectorStore
from ragbits.document_search import DocumentSearch
from ragbits.document_search.documents.document import DocumentMeta
from ragbits.document_search.ingestion.processor_strategies import DistributedProcessing

audit.set_trace_handlers("cli")

documents = [
DocumentMeta.create_text_document_from_literal(
"""
Expand Down
3 changes: 3 additions & 0 deletions examples/document-search/from_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@ class to rephrase the query.

import asyncio

from ragbits.core import audit
from ragbits.document_search import DocumentSearch
from ragbits.document_search.documents.document import DocumentMeta

audit.set_trace_handlers("cli")

documents = [
DocumentMeta.create_text_document_from_literal(
"""
Expand Down
3 changes: 3 additions & 0 deletions examples/document-search/multimodal.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import asyncio
from pathlib import Path

from ragbits.core import audit
from ragbits.core.embeddings.vertex_multimodal import VertexAIMultimodelEmbeddings
from ragbits.core.vector_stores.in_memory import InMemoryVectorStore
from ragbits.document_search import DocumentSearch
Expand All @@ -41,6 +42,8 @@
from ragbits.document_search.ingestion.document_processor import DocumentProcessorRouter
from ragbits.document_search.ingestion.providers.dummy import DummyImageProvider

audit.set_trace_handlers("cli")

IMAGES_PATH = Path(__file__).parent / "images"


Expand Down
3 changes: 3 additions & 0 deletions examples/document-search/qdrant.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@

from qdrant_client import AsyncQdrantClient

from ragbits.core import audit
from ragbits.core.embeddings.litellm import LiteLLMEmbeddings
from ragbits.core.vector_stores.qdrant import QdrantVectorStore
from ragbits.document_search import DocumentSearch, SearchConfig
from ragbits.document_search.documents.document import DocumentMeta

audit.set_trace_handlers("cli")

documents = [
DocumentMeta.create_text_document_from_literal(
"""
Expand Down
1 change: 1 addition & 0 deletions packages/ragbits-core/src/ragbits/core/audit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def clear_event_handlers() -> None:

_trace_handlers.clear()


@contextmanager
def trace(name: str | None = None, **inputs: Any) -> Iterator[SimpleNamespace]: # noqa: ANN401
"""
Expand Down
33 changes: 33 additions & 0 deletions packages/ragbits-core/src/ragbits/core/audit/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,36 @@ def trace(self, name: str, **inputs: Any) -> Iterator[SimpleNamespace]: # noqa:

span = self._spans.get().pop()
self.stop(outputs=vars(outputs), current_span=span)


def format_attributes(data: dict, prefix: str | None = None) -> dict:
"""
Format attributes for CLI.

Args:
data: The data to format.
prefix: The prefix to use for the keys.

Returns:
The formatted attributes.
"""
flattened = {}

for key, value in data.items():
current_key = f"{prefix}.{key}" if prefix else key

if isinstance(value, dict):
flattened.update(format_attributes(value, current_key))
elif isinstance(value, list | tuple):
flattened[current_key] = repr(
[
item if isinstance(item, str | float | int | bool) else repr(item)
for item in value # type: ignore
]
)
elif isinstance(value, str | float | int | bool):
flattened[current_key] = value
else:
flattened[current_key] = repr(value)

return flattened
Loading
Loading