agentx-python 0.2.1__tar.gz → 0.3.1__tar.gz

{agentx-python-0.2.1 → agentx_python-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: agentx-python
-Version: 0.2.1
+Version: 0.3.1
 Summary: Offical Python SDK for AgentX (https://www.agentx.so/)
 Home-page: https://github.com/AgentX-ai/AgentX-python-sdk
 Author: Robin Wang and AgentX Team
@@ -11,6 +11,17 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: urllib3>=1.26.11
+Requires-Dist: certifi
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # AgentX Python SDK API library
 
@@ -32,7 +43,7 @@ You can get an API key from https://app.agentx.so
 
 ### Agent
 
-```
+```python
 from agentx_python import AgentX
 
 client = AgentX(api_key="<your api key here>")
@@ -45,7 +56,7 @@ print(client.list_agents())
 
 Each Conversation has `agents` and `users` tied to it.
 
-```
+```python
 # get agent
 my_agent = client.get_agent(id="<agent id here>")
 
@@ -57,7 +68,7 @@ print(my_agent.list_conversations())
 
 A `chat` needs to happen in the conversation. You can do `stream` response too, default `False`.
 
-```
+```python
 a_conversation = my_agent.get_conversation(id="<conversation id here>")
 
 response = a_conversation.chat("Hello, what is your name?", stream=True)

{agentx-python-0.2.1 → agentx_python-0.3.1}/README.md

@@ -18,7 +18,7 @@ You can get an API key from https://app.agentx.so
 
 ### Agent
 
-```
+```python
 from agentx_python import AgentX
 
 client = AgentX(api_key="<your api key here>")
@@ -31,7 +31,7 @@ print(client.list_agents())
 
 Each Conversation has `agents` and `users` tied to it.
 
-```
+```python
 # get agent
 my_agent = client.get_agent(id="<agent id here>")
 
@@ -43,7 +43,7 @@ print(my_agent.list_conversations())
 
 A `chat` needs to happen in the conversation. You can do `stream` response too, default `False`.
 
-```
+```python
 a_conversation = my_agent.get_conversation(id="<conversation id here>")
 
 response = a_conversation.chat("Hello, what is your name?", stream=True)

{agentx-python-0.2.1/agentx_python → agentx_python-0.3.1/agentx}/__init__.py

@@ -1,7 +1,7 @@
 import logging
 
-from agentx_python.agentx import AgentX
-from agentx_python.version import VERSION
+from agentx.agentx import AgentX
+from agentx.version import VERSION
 
 logging.basicConfig(
     level=logging.INFO,

{agentx-python-0.2.1/agentx_python → agentx_python-0.3.1/agentx}/agentx.py

@@ -3,8 +3,8 @@ import requests
 import os
 import logging
 
-from agentx_python.util import get_headers
-from agentx_python.resources.agent import Agent
+from agentx.util import get_headers
+from agentx.resources.agent import Agent
 
 
 class AgentX:

{agentx-python-0.2.1/agentx_python → agentx_python-0.3.1/agentx}/resources/agent.py

@@ -4,7 +4,7 @@ import requests
 import os
 import logging
 from dataclasses import dataclass
-from agentx_python.util import get_headers
+from agentx.util import get_headers
 from .conversation import Conversation
 
 

agentx_python-0.3.1/agentx/resources/conversation.py

@@ -0,0 +1,128 @@
+import json
+import requests
+from typing import Optional, List, Any, Iterator
+from pydantic import BaseModel, Field
+from agentx.util import get_headers
+
+
+class ChatResponse(BaseModel):
+    text: str | None
+    cot: str | None
+    botId: str
+    reference: Optional[Any]
+    tasks: Optional[Any]
+
+
+class Message(BaseModel):
+    id: str = Field(alias="_id")
+    conversationId: str
+    role: str  # user or bot
+    botId: Optional[str] = Field(alias="bot", default=None)
+    userId: Optional[str] = Field(alias="user", default=None)
+    text: str | None
+    cot: str | None
+    createdAt: str
+    updatedAt: str
+
+    class Config:
+        populate_by_name = True
+        extra = "ignore"
+
+
+class Conversation(BaseModel):
+    agent_id: str
+    id: str = Field(alias="_id")
+    title: Optional[str] = Field(default=None)  # conversation customized title
+    users: List[str]
+    agents: List[str] = Field(alias="bots")
+    createdAt: Optional[str]
+    updatedAt: Optional[str]
+
+    class Config:
+        populate_by_name = True
+        extra = "ignore"
+
+    def __init__(self, **data):
+        super().__init__(**data)
+
+    def new_conversation(self) -> "Conversation":
+        url = f"https://api.agentx.so/api/v1/access/agents/{self.agent_id}/conversations/new"
+        response = requests.post(
+            url,
+            headers=get_headers(),
+            json={"type": "chat"},
+        )
+        if response.status_code == 200:
+            new_conv = response.json()
+            new_conv["agent_id"] = self.agent_id
+            return Conversation(**new_conv)
+        else:
+            raise Exception(
+                f"Failed to create new conversation: {response.status_code} - {response.reason}"
+            )
+
+    def list_messages(self) -> List[Message]:
+        url = f"https://api.agentx.so/api/v1/access/agents/{self.agent_id}/conversations/{self.id}"
+        response = requests.get(url, headers=get_headers())
+        if response.status_code == 200:
+            res = response.json()
+            if res.get("messages"):
+                message_list = []
+                for message in res["messages"]:
+                    if message.get("bot"):
+                        message["role"] = "bot"
+                    else:
+                        message["role"] = "user"
+                    message_list.append(Message(**message))
+                return message_list
+            else:
+                raise Exception("No messages found in the conversation.")
+        else:
+            raise Exception(
+                f"Failed to retrieve agent details: {response.status_code} - {response.reason}"
+            )
+
+    def chat(self, message: str, context: int = None):
+        url = f"https://api.agentx.so/api/v1/access/conversations/{self.id}/message"
+        response = requests.post(
+            url,
+            headers=get_headers(),
+            json={"message": message, "context": context},
+        )
+        return response.json()
+
+    def chat_stream(self, message: str, context: int = None) -> Iterator[ChatResponse]:
+        url = f"https://api.agentx.so/api/v1/access/conversations/{self.id}/jsonmessagesse"
+        response = requests.post(
+            url, headers=get_headers(), json={"message": message, "context": context}
+        )
+        result = ""
+        if response.status_code == 200:
+            buf = b""
+            for chunk in response.iter_content():
+                buf += chunk
+                try:
+                    chunk = buf.decode("utf-8")
+                    # yield chunk
+                except UnicodeDecodeError:
+                    continue
+                result += chunk
+                buf = b""
+                try:
+                    if result.count("{") == result.count("}"):
+                        catch_json = json.loads(result)
+                        if catch_json:
+                            result = ""
+                            yield ChatResponse(
+                                text=catch_json.get("text"),
+                                cot=catch_json.get("cot"),
+                                botId=catch_json.get("botId"),
+                                reference=catch_json.get("reference"),
+                                tasks=catch_json.get("tasks"),
+                            )
+                except json.JSONDecodeError:
+                    continue
+        else:
+            raise Exception(
+                f"Failed to send message: {response.status_code} - {response.reason}"
+            )

agentx_python-0.3.1/agentx/version.py

@@ -0,0 +1 @@
+VERSION = "0.3.0"

{agentx-python-0.2.1 → agentx_python-0.3.1}/agentx_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: agentx-python
-Version: 0.2.1
+Version: 0.3.1
 Summary: Offical Python SDK for AgentX (https://www.agentx.so/)
 Home-page: https://github.com/AgentX-ai/AgentX-python-sdk
 Author: Robin Wang and AgentX Team
@@ -11,6 +11,17 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: urllib3>=1.26.11
+Requires-Dist: certifi
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # AgentX Python SDK API library
 
@@ -32,7 +43,7 @@ You can get an API key from https://app.agentx.so
 
 ### Agent
 
-```
+```python
 from agentx_python import AgentX
 
 client = AgentX(api_key="<your api key here>")
@@ -45,7 +56,7 @@ print(client.list_agents())
 
 Each Conversation has `agents` and `users` tied to it.
 
-```
+```python
 # get agent
 my_agent = client.get_agent(id="<agent id here>")
 
@@ -57,7 +68,7 @@ print(my_agent.list_conversations())
 
 A `chat` needs to happen in the conversation. You can do `stream` response too, default `False`.
 
-```
+```python
 a_conversation = my_agent.get_conversation(id="<conversation id here>")
 
 response = a_conversation.chat("Hello, what is your name?", stream=True)

agentx_python-0.3.1/agentx_python.egg-info/SOURCES.txt

@@ -0,0 +1,15 @@
+LICENSE
+README.md
+setup.py
+agentx/__init__.py
+agentx/agentx.py
+agentx/util.py
+agentx/version.py
+agentx/resources/__init__.py
+agentx/resources/agent.py
+agentx/resources/conversation.py
+agentx_python.egg-info/PKG-INFO
+agentx_python.egg-info/SOURCES.txt
+agentx_python.egg-info/dependency_links.txt
+agentx_python.egg-info/requires.txt
+agentx_python.egg-info/top_level.txt

agentx_python-0.3.1/agentx_python.egg-info/top_level.txt

@@ -0,0 +1 @@
+agentx

{agentx-python-0.2.1 → agentx_python-0.3.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="agentx-python",
-    version="0.2.1",  # Update this version number each time you make a release
+    version="0.3.1",  # Update this version number each time you make a release
     packages=find_packages(),
     install_requires=[
         "urllib3>=1.26.11",

agentx-python-0.2.1/agentx_python/resources/conversation.py

@@ -1,63 +0,0 @@
-from typing import Optional, List
-from pydantic import BaseModel, Field
-import os
-import requests
-from agentx_python.util import get_headers
-
-
-class Conversation(BaseModel):
-    agent_id: str
-    id: str
-    title: Optional[str] = Field(default=None)  # conversation customized title
-    users: List[str]
-    agents: List[str]
-    createdAt: Optional[str]
-    updatedAt: Optional[str]
-
-    def __init__(self, **data):
-        super().__init__(**data)
-
-    def generate_conversation_id(self):
-        return "generate new_conversation_id"
-
-    def list_messages(self):
-        url = f"https://api.agentx.so/api/v1/access/agents/{self.agent_id}/conversations/{self.id}"
-        response = requests.get(url, headers=get_headers())
-        if response.status_code == 200:
-            return response.json()
-        else:
-            raise Exception(
-                f"Failed to retrieve agent details: {response.status_code} - {response.reason}"
-            )
-
-    def chat(self, message: str, stream: bool = False, context: int = None):
-        if stream:
-            return self._chat_stream(message, context)
-        else:
-            url = f"https://api.agentx.so/api/v1/access/conversations/{self.id}/message"
-            response = requests.post(
-                url,
-                headers=get_headers(),
-                json={"message": message, "context": context},
-            )
-            return response.json()
-
-    def _chat_stream(self, message: str, context: int = None):
-        url = f"https://api.agentx.so/api/v1/access/conversations/{self.id}/messagesse"
-        response = requests.post(
-            url, headers=get_headers(), json={"message": message, "context": context}
-        )
-        if response.status_code == 200:
-            buf = b""
-            for chunk in response.iter_content():
-                buf += chunk
-                try:
-                    chunk = buf.decode("utf-8")
-                    yield chunk
-                except UnicodeDecodeError:
-                    continue
-                buf = b""
-        else:
-            raise Exception(
-                f"Failed to send message: {response.status_code} - {response.reason}"
-            )

agentx-python-0.2.1/agentx_python/version.py

@@ -1 +0,0 @@
-VERSION = "0.1.0"

agentx-python-0.2.1/agentx_python.egg-info/SOURCES.txt

@@ -1,15 +0,0 @@
-LICENSE
-README.md
-setup.py
-agentx_python/__init__.py
-agentx_python/agentx.py
-agentx_python/util.py
-agentx_python/version.py
-agentx_python.egg-info/PKG-INFO
-agentx_python.egg-info/SOURCES.txt
-agentx_python.egg-info/dependency_links.txt
-agentx_python.egg-info/requires.txt
-agentx_python.egg-info/top_level.txt
-agentx_python/resources/__init__.py
-agentx_python/resources/agent.py
-agentx_python/resources/conversation.py

agentx-python-0.2.1/agentx_python.egg-info/top_level.txt

@@ -1 +0,0 @@
-agentx_python