Merge branch 'development' of github.com:Scale3-Labs/langtrace-python-sdk into ali/s3en-2136-instrument-litellm

Author: alizenhom

.github/resources/slack-payloads/slack-message-template.json

@@ -0,0 +1,22 @@
+{
+	"attachments": [
+		{
+			"pretext": "{{ env.PRE_TEXT_MESSAGE }}",
+			"fallback": "{{ env.FALLBACK_MESSAGE }}",
+			"color": "{{ env.COLOR }}",
+			"author_name": "{{ github.workflow }}",
+			"author_link": "{{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}",
+			"title": "{{ env.GITHUB_REPOSITORY }}",
+			"title_link": "{{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}",
+			"fields": [
+				{
+					"title": "Release Tag",
+					"short": true,
+					"value": "{{ env.RELEASETAG }}"
+				}
+			],
+			"footer": "deployed by: {{ github.actor }}",
+			"footer_icon": "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"
+		}
+	]
+}

.github/workflows/release.yml

@@ -21,17 +21,17 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-            python-version: '3.x'
+          python-version: "3.x"
 
       - name: Install hatch
-        run: | 
+        run: |
           pip install hatch
-      
+
       - name: Get Version
         id: version
-        run: | 
+        run: |
           echo "version=$(hatch version)" >> $GITHUB_OUTPUT
-          
+
   publish:
     runs-on: ubuntu-latest
     needs:
@@ -54,17 +54,58 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-            python-version: '3.x'
+          python-version: "3.x"
 
       - name: Install hatch
-        run: | 
+        run: |
           pip install hatch
 
       - name: Build SDK
-        run: | 
+        run: |
           hatch build
 
       - name: Publish Python 🐍 distributions 📦 to PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_TOKEN }}
+
+  post-release:
+    name: Post Release Actions
+
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs:
+      - generate-version
+      - publish
+
+    steps:
+      - name: Checkout main branch
+        uses: actions/[email protected]
+        with:
+          ref: main
+
+      - name: Slack - Success Message
+        uses: DSdatsme/slack-github-action@env_support
+        if: ${{ success() && needs.publish.result == 'success' }}
+        with:
+          channel-id: ${{ vars.SLACK_CHANNEL_ID }}
+          payload-file-path: ./.github/resources/slack-payloads/slack-message-template.json
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          RELEASETAG: ${{ needs.generate-version.outputs.new_version }}
+          PRE_TEXT_MESSAGE: "Workflow Passed! :successkid:"
+          FALLBACK_MESSAGE: "Workflow Passed!"
+          COLOR: "good"
+
+      - name: Slack - Failure Message
+        uses: DSdatsme/slack-github-action@env_support
+        if: ${{ failure() || needs.publish.result != 'success' }}
+        with:
+          channel-id: ${{ vars.SLACK_CHANNEL_ID }}
+          payload-file-path: ./.github/resources/slack-payloads/slack-message-template.json
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          RELEASETAG: ${{ needs.generate-version.outputs.new_version }}
+          PRE_TEXT_MESSAGE: "<!channel> Workflow Failed! :x:"
+          FALLBACK_MESSAGE: "Workflow Failed!"
+          COLOR: "danger"

README.md

@@ -194,7 +194,7 @@ def main():
 from langtrace_python_sdk import with_langtrace_root_span, with_additional_attributes
 
 
-@with_additional_attributes({"user.id": "1234", "user.feedback.rating": 1})
+@with_additional_attributes({"user.id": "1234"})
 def api_call1():
     response = client.chat.completions.create(
         model="gpt-4",
@@ -204,7 +204,7 @@ def api_call1():
     return response
 
 
-@with_additional_attributes({"user.id": "5678", "user.feedback.rating": -1})
+@with_additional_attributes({"user.id": "5678"})
 def api_call2():
     response = client.chat.completions.create(
         model="gpt-4",
@@ -228,6 +228,11 @@ from langtrace_python_sdk import get_prompt_from_registry
 prompt = get_prompt_from_registry(<Registry ID>, options={"prompt_version": 1, "variables": {"foo": "bar"} })
 ```
 
+### Opt out of tracing prompt and completion data
+By default, prompt and completion data are captured. If you would like to opt out of it, set the following env var,
+
+`TRACE_PROMPT_COMPLETION_DATA=false`
+
 ## Supported integrations
 
 Langtrace automatically captures traces from the following vendors:
@@ -248,6 +253,7 @@ Langtrace automatically captures traces from the following vendors:
 | CrewAI       | Framework       | :x:                | :white_check_mark:              |
 | Ollama       | Framework       | :x:                | :white_check_mark:              |
 | VertexAI     | Framework       | :x:                | :white_check_mark:              |
+| Vercel AI SDK| Framework       | :white_check_mark: | :x:                             |
 | Pinecone     | Vector Database | :white_check_mark: | :white_check_mark:              |
 | ChromaDB     | Vector Database | :white_check_mark: | :white_check_mark:              |
 | QDrant       | Vector Database | :white_check_mark: | :white_check_mark:              |

pyproject.toml

@@ -18,10 +18,10 @@ classifiers=[
     "Operating System :: OS Independent",
 ]
 dependencies = [
-  'trace-attributes>=6.0.0,<7.0.0',
+  'trace-attributes==7.0.1',
   'opentelemetry-api>=1.25.0',
   'opentelemetry-sdk>=1.25.0',
-  'opentelemetry-instrumentation>=0.46b0',
+  'opentelemetry-instrumentation>=0.47b0',
   'opentelemetry-instrumentation-sqlalchemy>=0.46b0',
   'opentelemetry-exporter-otlp-proto-http>=1.25.0',
   'opentelemetry-exporter-otlp-proto-grpc>=1.25.0',

src/examples/crewai_example/__init__.py

@@ -0,0 +1,32 @@
+from crewai import Agent
+from langchain_openai import ChatOpenAI
+from langchain_anthropic import ChatAnthropic
+from langchain_cohere import ChatCohere
+from langchain_ollama import ChatOllama
+
+
+class PoetryAgents:
+    def __init__(self):
+        self.open_ai = ChatOpenAI(
+            model_name="gpt-4", temperature=0.7, stream_usage=True
+        )
+        self.anthropic = ChatAnthropic(
+            model_name="claude-3-5-sonnet-20240620", temperature=0.7
+        )
+
+        self.cohere = ChatCohere(model="command-r", temperature=0.7)
+        self.ollama = ChatOllama(model="llama3", temperature=0.7)
+
+    def create_poet_agent(self):
+        return Agent(
+            role="Expert Poetry Writer",
+            backstory="""
+                    I am an Expert in poetry writing and creative expression.
+                    I have been writing poetry for over 10 years and have published several collections.
+                    I have a deep understanding of various poetic forms, styles, and themes. I am here to help you create beautiful and meaningful poetry that resonates with your emotions and experiences.
+                """,
+            goal="""Create a poem that captures the essence of a given theme or emotion""",
+            allow_delegation=False,
+            verbose=True,
+            llm=self.ollama,
+        )

src/examples/crewai_example/simple_agent/__init__.py

@@ -0,0 +1,48 @@
+from crewai import Crew
+from textwrap import dedent
+from .agents import PoetryAgents
+from .tasks import PoetryTasks
+from langtrace_python_sdk import langtrace
+from dotenv import load_dotenv
+import agentops
+
+load_dotenv()
+agentops.init()
+langtrace.init(write_spans_to_console=False, batch=False)
+
+
+class PoetryCrew:
+    def __init__(self, topic) -> None:
+        self.topic = topic
+
+    def run(self):
+        agents = PoetryAgents()
+        tasks = PoetryTasks()
+
+        poetry_agent = agents.create_poet_agent()
+
+        create_poem = tasks.create_poem(poetry_agent, self.topic)
+
+        crew = Crew(agents=[poetry_agent], tasks=[create_poem], verbose=True)
+        res = crew.kickoff()
+        return res
+
+
+# This is the main function that you will use to run your custom crew.
+if __name__ == "__main__":
+    print("## Welcome to Poetry Crew")
+    print("-------------------------------")
+    topic = input(
+        dedent(
+            """
+      What topic do you want to write a poem on?
+    """
+        )
+    )
+
+    poetry_crew = PoetryCrew(topic=topic)
+    result = poetry_crew.run()
+    print("\n\n########################")
+    print("## Here is you poem")
+    print("########################\n")
+    print(result)

src/examples/crewai_example/simple_agent/agents.py

@@ -0,0 +1,21 @@
+from crewai import Task
+from textwrap import dedent
+
+
+class PoetryTasks:
+    def create_poem(self, agent, topic):
+        return Task(
+            description=dedent(
+                f"""
+            **Task**: Create a Poem on {topic}
+            **Description**: Write a poem on the given topic that captures the essence of the theme or emotion. 
+                The poem should be creative, expressive, and resonate with the reader's emotions and experiences. 
+                Your poem should be well-structured, engaging, and evoke a sense of beauty and meaning.
+
+            **Parameters**: 
+            - Topic: {topic}
+        """
+            ),
+            expected_output="A creative and expressive poem that captures the essence of the given topic.",
+            agent=agent,
+        )