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.

Sign up for GitHub

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

Astra DB: Add integration usage tracking #568

Merged
merged 7 commits into from
Mar 18, 2024
Merged

Astra DB: Add integration usage tracking #568

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd14a59
Astra DB: Add integration usage tracking
erichare Mar 11, 2024
b07d5d7
Update astra_client.py
erichare Mar 11, 2024
8844f21
Update requirements.txt
erichare Mar 11, 2024
b07c29a
Fix sorting of imports for ruff linting
erichare Mar 11, 2024
c928205
Hardcode the caller name
erichare Mar 12, 2024
6f2e8f8
Update astra_client.py
erichare Mar 12, 2024
55686e3
Merge branch 'main' into astra-usage-tracking
erichare Mar 16, 2024
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
2 changes: 1 addition & 1 deletion integrations/astra/examples/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
haystack-ai==2.0.0b4
sentence_transformers==2.2.2
openai==1.6.1
astrapy>=0.7.0
astrapy>=0.7.7
12 changes: 11 additions & 1 deletion integrations/astra/src/haystack_integrations/document_stores/astra/astra_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

from astrapy.api import APIRequestError
from astrapy.db import AstraDB

# For version tracking
from haystack import __name__ as integration_name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would just hardcode the string haystack at the module level and save an import call, something like

CALLER_NAME = 'haystack'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@masci does this look okay? i updated the code.

from haystack.version import __version__ as integration_version
from pydantic.dataclasses import dataclass

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -64,7 +68,13 @@ def __init__(
self.namespace = namespace

# Build the Astra DB object
self._astra_db = AstraDB(api_endpoint=api_endpoint, token=token, namespace=namespace)
self._astra_db = AstraDB(
api_endpoint=api_endpoint,
token=token,
namespace=namespace,
caller_name=integration_name,
caller_version=integration_version,
)

try:
# Create and connect to the newly created collection
Expand Down