mara-client 0.15.3__py3-none-any.whl → 0.15.4__py3-none-any.whl

mara_client/clients.py

@@ -1,5 +1,5 @@
 import requests
-from typing import List, Optional
+from typing import List, Optional, Union
 from .models import ChatFile, ChatResult, DataTable
 from . import utils
 
@@ -122,12 +122,12 @@ class FileManager:
 
     def upload(self, filepath: str) -> ChatFile:
         path = f'chats/{self.chat_id}/files'
-        with open(filepath, 'rb') as file:
-            resp = self.client._request(
-                method='POST',
-                path=path,
-                files={'file': open(filepath, 'rb')}
-            )
+        resp = self.client._request(
+            method='POST',
+            path=path,
+            json=None,
+            files={'file': open(filepath, 'rb')}
+        )
         return ChatFile(**resp.json())
 
     def list(self) -> List[dict]:
@@ -166,16 +166,20 @@ class Chat:
         """Delete the chat and all of its data and files."""
         self.client._request(method='DELETE', path=f'chats/{self.chat_id}')
 
-    def prompt(self, content: str, files: List[str] = None) -> ChatResult:
+    def prompt(self, content: str, files: List[Union[str, ChatFile]] = None) -> ChatResult:
         """Prompt the chat with a message and optional files. Return the result."""
         files = files or []
 
-        files_payload = []
+        file_ids = []
         for fi in files:
-            files_payload.append(('file', (fi, open(fi, 'rb'))))
-        data = {'content': content}
+            if isinstance(fi, str):
+                fi = self.files.upload(fi)
+            elif not isinstance(fi, ChatFile):
+                raise ValueError('Files must be either string file paths or ChatFile objects')
+            file_ids.append(fi.id)
+        data = {'content': content, 'files': file_ids}
         path = f'chats/{self.chat_id}'
-        r = self.client._request(path=path, json=data, files=files_payload)
+        r = self.client._request(path=path, json=data)
         return ChatResult.from_response(r.text)
 
     def get_context(self) -> str:

{mara_client-0.15.3.dist-info → mara_client-0.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mara_client
-Version: 0.15.3
+Version: 0.15.4
 Summary: A client for the MARA conversational agent for cheminformatics.
 Home-page: https://nanome.ai/mara
 Author: Sam Hessenauer, Alex McNerney, Mike Rosengrant
@@ -37,11 +37,11 @@ To use the MARA client, you need to have an API key. You can create one at https
 MARA chats are created using the `new_chat` method, or retrieved with the `get_chat` method of the client. You can then interact with the chat using the `prompt` method. The `prompt` method returns a `ChatResult` object, which contains the response from MARA, intermediate messages such as tool runs, and any files that were generated during the conversation. You can download these files using the `download_file` method of the chat. Chat will be visible as conversations in the MARA web interface, and can be deleted using the `delete` method.
 
 ```python
-import mara_client
+from mara_client import MARAClient
 
 API_KEY = "..."
 URL = "https://mara.example.com" # optional
-client = mara.Client(API_KEY, URL)
+client = MARAClient(API_KEY, URL)
 
 chat = client.new_chat()
 # or, chat = client.get_chat("chat_id")
@@ -72,6 +72,28 @@ chat.delete()
 # remove chat from history, delete associated files and data
 ```
 
+### Files
+
+The chat object contains a `files` attribute for working with files.
+
+```python
+# Upload a file as part of a prompt
+file_path = './example.sdf'
+result = chat.prompt('Convert this to SMILES', files=[file_path])
+
+# List all files
+file_list = chat.files.list()
+
+# Download a file
+file_name = file_list[0].name
+chat.files.download(file_name, 'output.sdf')
+
+# Upload a file directly
+file_path = './example.sdf'
+file = chat.files.upload(file_path)
+print(file.id)
+```
+
 ### Data Tables
 
 The chat object contains a `datatables` attribute for working with DataTables.

mara_client-0.15.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+mara_client/__init__.py,sha256=Bj_FA5MS3KtXjoE1f_AqPisZI01daWj3eru14UCK4tw,45
+mara_client/clients.py,sha256=9V_hRnD34wHSjE1rskGtCJG7ysubKMa_Qm9bijgxPQA,7847
+mara_client/models.py,sha256=FdHv87TohZSfAXjh9UxAJQX7x0LFtZfoNao6yeEesCs,2719
+mara_client/utils.py,sha256=_pK30UynDGE9MaEbSY_INxcjIyxhlXBI8eMzPF_ryg0,755
+mara_client-0.15.4.dist-info/METADATA,sha256=G-wdcXi0hagMOVJT-Y23hovHqOU28qnnzYBCKSs0T9o,3688
+mara_client-0.15.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mara_client-0.15.4.dist-info/top_level.txt,sha256=kBfHb_yKywadvXTNAMeOIMgWpS7lqON93jMRUG6Wgqc,12
+mara_client-0.15.4.dist-info/RECORD,,

mara_client-0.15.3.dist-info/RECORD

@@ -1,8 +0,0 @@
-mara_client/__init__.py,sha256=Bj_FA5MS3KtXjoE1f_AqPisZI01daWj3eru14UCK4tw,45
-mara_client/clients.py,sha256=GawEFJ5UQhOfuus8D-MhE6a_w5MWbzDT2eC_NLXxYHs,7679
-mara_client/models.py,sha256=FdHv87TohZSfAXjh9UxAJQX7x0LFtZfoNao6yeEesCs,2719
-mara_client/utils.py,sha256=_pK30UynDGE9MaEbSY_INxcjIyxhlXBI8eMzPF_ryg0,755
-mara_client-0.15.3.dist-info/METADATA,sha256=EKBZh0fomM5AOaiCHrzbLMgGXcl5YzBPE-JFOnrbDZY,3200
-mara_client-0.15.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mara_client-0.15.3.dist-info/top_level.txt,sha256=kBfHb_yKywadvXTNAMeOIMgWpS7lqON93jMRUG6Wgqc,12
-mara_client-0.15.3.dist-info/RECORD,,