lionagi 0.0.103__tar.gz → 0.0.105__tar.gz

Sign up to get free protection for your applications and to get access to all the features.
Files changed (39) hide show
  1. lionagi-0.0.105/PKG-INFO +311 -0
  2. {lionagi-0.0.103 → lionagi-0.0.105}/README.md +13 -4
  3. lionagi-0.0.105/README.rst +9 -0
  4. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi/__init__.py +0 -1
  5. lionagi-0.0.105/lionagi/api/__init__.py +7 -0
  6. lionagi-0.0.103/lionagi/config/llmconfig.py → lionagi-0.0.105/lionagi/api/oai_config.py +2 -2
  7. lionagi-0.0.103/lionagi/api/OAIService.py → lionagi-0.0.105/lionagi/api/oai_service.py +23 -13
  8. lionagi-0.0.105/lionagi/session/__init__.py +5 -0
  9. lionagi-0.0.105/lionagi/session/conversation.py +95 -0
  10. lionagi-0.0.105/lionagi/session/message.py +139 -0
  11. lionagi-0.0.105/lionagi/session/session.py +291 -0
  12. lionagi-0.0.105/lionagi/tools/__init__.py +0 -0
  13. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi/utils/__init__.py +4 -5
  14. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi/utils/api_util.py +12 -20
  15. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi/utils/doc_util.py +38 -38
  16. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi/utils/sys_util.py +6 -3
  17. lionagi-0.0.105/lionagi/utils/tool_util.py +194 -0
  18. lionagi-0.0.105/lionagi/version.py +1 -0
  19. lionagi-0.0.105/lionagi.egg-info/PKG-INFO +311 -0
  20. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi.egg-info/SOURCES.txt +7 -5
  21. lionagi-0.0.105/lionagi.egg-info/requires.txt +4 -0
  22. lionagi-0.0.105/pyproject.toml +28 -0
  23. lionagi-0.0.103/PKG-INFO +0 -97
  24. lionagi-0.0.103/lionagi/api/__init__.py +0 -6
  25. lionagi-0.0.103/lionagi/config/__init__.py +0 -4
  26. lionagi-0.0.103/lionagi/config/oaiconfig.py +0 -19
  27. lionagi-0.0.103/lionagi/session/__init__.py +0 -9
  28. lionagi-0.0.103/lionagi/session/conversation.py +0 -91
  29. lionagi-0.0.103/lionagi/session/message.py +0 -73
  30. lionagi-0.0.103/lionagi/session/session.py +0 -149
  31. lionagi-0.0.103/lionagi/version.py +0 -1
  32. lionagi-0.0.103/lionagi.egg-info/PKG-INFO +0 -97
  33. lionagi-0.0.103/lionagi.egg-info/requires.txt +0 -4
  34. {lionagi-0.0.103 → lionagi-0.0.105}/LICENSE +0 -0
  35. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi/utils/log_util.py +0 -0
  36. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi.egg-info/dependency_links.txt +0 -0
  37. {lionagi-0.0.103 → lionagi-0.0.105}/lionagi.egg-info/top_level.txt +0 -0
  38. {lionagi-0.0.103 → lionagi-0.0.105}/setup.cfg +0 -0
  39. {lionagi-0.0.103 → lionagi-0.0.105}/setup.py +0 -0
@@ -0,0 +1,311 @@
1
+ Metadata-Version: 2.1
2
+ Name: lionagi
3
+ Version: 0.0.105
4
+ Summary: Towards automated general intelligence.
5
+ Author: HaiyangLi
6
+ Author-email: Haiyang Li <ocean@lionagi.ai>
7
+ License: Apache License
8
+ Version 2.0, January 2004
9
+ http://www.apache.org/licenses/
10
+
11
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
12
+
13
+ 1. Definitions.
14
+
15
+ "License" shall mean the terms and conditions for use, reproduction,
16
+ and distribution as defined by Sections 1 through 9 of this document.
17
+
18
+ "Licensor" shall mean the copyright owner or entity authorized by
19
+ the copyright owner that is granting the License.
20
+
21
+ "Legal Entity" shall mean the union of the acting entity and all
22
+ other entities that control, are controlled by, or are under common
23
+ control with that entity. For the purposes of this definition,
24
+ "control" means (i) the power, direct or indirect, to cause the
25
+ direction or management of such entity, whether by contract or
26
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
27
+ outstanding shares, or (iii) beneficial ownership of such entity.
28
+
29
+ "You" (or "Your") shall mean an individual or Legal Entity
30
+ exercising permissions granted by this License.
31
+
32
+ "Source" form shall mean the preferred form for making modifications,
33
+ including but not limited to software source code, documentation
34
+ source, and configuration files.
35
+
36
+ "Object" form shall mean any form resulting from mechanical
37
+ transformation or translation of a Source form, including but
38
+ not limited to compiled object code, generated documentation,
39
+ and conversions to other media types.
40
+
41
+ "Work" shall mean the work of authorship, whether in Source or
42
+ Object form, made available under the License, as indicated by a
43
+ copyright notice that is included in or attached to the work
44
+ (an example is provided in the Appendix below).
45
+
46
+ "Derivative Works" shall mean any work, whether in Source or Object
47
+ form, that is based on (or derived from) the Work and for which the
48
+ editorial revisions, annotations, elaborations, or other modifications
49
+ represent, as a whole, an original work of authorship. For the purposes
50
+ of this License, Derivative Works shall not include works that remain
51
+ separable from, or merely link (or bind by name) to the interfaces of,
52
+ the Work and Derivative Works thereof.
53
+
54
+ "Contribution" shall mean any work of authorship, including
55
+ the original version of the Work and any modifications or additions
56
+ to that Work or Derivative Works thereof, that is intentionally
57
+ submitted to Licensor for inclusion in the Work by the copyright owner
58
+ or by an individual or Legal Entity authorized to submit on behalf of
59
+ the copyright owner. For the purposes of this definition, "submitted"
60
+ means any form of electronic, verbal, or written communication sent
61
+ to the Licensor or its representatives, including but not limited to
62
+ communication on electronic mailing lists, source code control systems,
63
+ and issue tracking systems that are managed by, or on behalf of, the
64
+ Licensor for the purpose of discussing and improving the Work, but
65
+ excluding communication that is conspicuously marked or otherwise
66
+ designated in writing by the copyright owner as "Not a Contribution."
67
+
68
+ "Contributor" shall mean Licensor and any individual or Legal Entity
69
+ on behalf of whom a Contribution has been received by Licensor and
70
+ subsequently incorporated within the Work.
71
+
72
+ 2. Grant of Copyright License. Subject to the terms and conditions of
73
+ this License, each Contributor hereby grants to You a perpetual,
74
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
75
+ copyright license to reproduce, prepare Derivative Works of,
76
+ publicly display, publicly perform, sublicense, and distribute the
77
+ Work and such Derivative Works in Source or Object form.
78
+
79
+ 3. Grant of Patent License. Subject to the terms and conditions of
80
+ this License, each Contributor hereby grants to You a perpetual,
81
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
82
+ (except as stated in this section) patent license to make, have made,
83
+ use, offer to sell, sell, import, and otherwise transfer the Work,
84
+ where such license applies only to those patent claims licensable
85
+ by such Contributor that are necessarily infringed by their
86
+ Contribution(s) alone or by combination of their Contribution(s)
87
+ with the Work to which such Contribution(s) was submitted. If You
88
+ institute patent litigation against any entity (including a
89
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
90
+ or a Contribution incorporated within the Work constitutes direct
91
+ or contributory patent infringement, then any patent licenses
92
+ granted to You under this License for that Work shall terminate
93
+ as of the date such litigation is filed.
94
+
95
+ 4. Redistribution. You may reproduce and distribute copies of the
96
+ Work or Derivative Works thereof in any medium, with or without
97
+ modifications, and in Source or Object form, provided that You
98
+ meet the following conditions:
99
+
100
+ (a) You must give any other recipients of the Work or
101
+ Derivative Works a copy of this License; and
102
+
103
+ (b) You must cause any modified files to carry prominent notices
104
+ stating that You changed the files; and
105
+
106
+ (c) You must retain, in the Source form of any Derivative Works
107
+ that You distribute, all copyright, patent, trademark, and
108
+ attribution notices from the Source form of the Work,
109
+ excluding those notices that do not pertain to any part of
110
+ the Derivative Works; and
111
+
112
+ (d) If the Work includes a "NOTICE" text file as part of its
113
+ distribution, then any Derivative Works that You distribute must
114
+ include a readable copy of the attribution notices contained
115
+ within such NOTICE file, excluding those notices that do not
116
+ pertain to any part of the Derivative Works, in at least one
117
+ of the following places: within a NOTICE text file distributed
118
+ as part of the Derivative Works; within the Source form or
119
+ documentation, if provided along with the Derivative Works; or,
120
+ within a display generated by the Derivative Works, if and
121
+ wherever such third-party notices normally appear. The contents
122
+ of the NOTICE file are for informational purposes only and
123
+ do not modify the License. You may add Your own attribution
124
+ notices within Derivative Works that You distribute, alongside
125
+ or as an addendum to the NOTICE text from the Work, provided
126
+ that such additional attribution notices cannot be construed
127
+ as modifying the License.
128
+
129
+ You may add Your own copyright statement to Your modifications and
130
+ may provide additional or different license terms and conditions
131
+ for use, reproduction, or distribution of Your modifications, or
132
+ for any such Derivative Works as a whole, provided Your use,
133
+ reproduction, and distribution of the Work otherwise complies with
134
+ the conditions stated in this License.
135
+
136
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
137
+ any Contribution intentionally submitted for inclusion in the Work
138
+ by You to the Licensor shall be under the terms and conditions of
139
+ this License, without any additional terms or conditions.
140
+ Notwithstanding the above, nothing herein shall supersede or modify
141
+ the terms of any separate license agreement you may have executed
142
+ with Licensor regarding such Contributions.
143
+
144
+ 6. Trademarks. This License does not grant permission to use the trade
145
+ names, trademarks, service marks, or product names of the Licensor,
146
+ except as required for reasonable and customary use in describing the
147
+ origin of the Work and reproducing the content of the NOTICE file.
148
+
149
+ 7. Disclaimer of Warranty. Unless required by applicable law or
150
+ agreed to in writing, Licensor provides the Work (and each
151
+ Contributor provides its Contributions) on an "AS IS" BASIS,
152
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
153
+ implied, including, without limitation, any warranties or conditions
154
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
155
+ PARTICULAR PURPOSE. You are solely responsible for determining the
156
+ appropriateness of using or redistributing the Work and assume any
157
+ risks associated with Your exercise of permissions under this License.
158
+
159
+ 8. Limitation of Liability. In no event and under no legal theory,
160
+ whether in tort (including negligence), contract, or otherwise,
161
+ unless required by applicable law (such as deliberate and grossly
162
+ negligent acts) or agreed to in writing, shall any Contributor be
163
+ liable to You for damages, including any direct, indirect, special,
164
+ incidental, or consequential damages of any character arising as a
165
+ result of this License or out of the use or inability to use the
166
+ Work (including but not limited to damages for loss of goodwill,
167
+ work stoppage, computer failure or malfunction, or any and all
168
+ other commercial damages or losses), even if such Contributor
169
+ has been advised of the possibility of such damages.
170
+
171
+ 9. Accepting Warranty or Additional Liability. While redistributing
172
+ the Work or Derivative Works thereof, You may choose to offer,
173
+ and charge a fee for, acceptance of support, warranty, indemnity,
174
+ or other liability obligations and/or rights consistent with this
175
+ License. However, in accepting such obligations, You may act only
176
+ on Your own behalf and on Your sole responsibility, not on behalf
177
+ of any other Contributor, and only if You agree to indemnify,
178
+ defend, and hold each Contributor harmless for any liability
179
+ incurred by, or claims asserted against, such Contributor by reason
180
+ of your accepting any such warranty or additional liability.
181
+
182
+ END OF TERMS AND CONDITIONS
183
+
184
+ APPENDIX: How to apply the Apache License to your work.
185
+
186
+ To apply the Apache License to your work, attach the following
187
+ boilerplate notice, with the fields enclosed by brackets "[]"
188
+ replaced with your own identifying information. (Don't include
189
+ the brackets!) The text should be enclosed in the appropriate
190
+ comment syntax for the file format. We also recommend that a
191
+ file or class name and description of purpose be included on the
192
+ same "printed page" as the copyright notice for easier
193
+ identification within third-party archives.
194
+
195
+ Copyright 2023 HaiyangLi <ocean@lionagi.ai>
196
+
197
+ Licensed under the Apache License, Version 2.0 (the "License");
198
+ you may not use this file except in compliance with the License.
199
+ You may obtain a copy of the License at
200
+
201
+ http://www.apache.org/licenses/LICENSE-2.0
202
+
203
+ Unless required by applicable law or agreed to in writing, software
204
+ distributed under the License is distributed on an "AS IS" BASIS,
205
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
206
+ See the License for the specific language governing permissions and
207
+ limitations under the License.
208
+
209
+ Project-URL: PyPI, https://pypi.org/project/lionagi/
210
+ Project-URL: Repository, https://github.com/lion-agi/lionagi
211
+ Project-URL: Discord, https://discord.gg/ACnynvvPjt
212
+ Classifier: Programming Language :: Python :: 3
213
+ Classifier: License :: OSI Approved :: Apache Software License
214
+ Classifier: Operating System :: OS Independent
215
+ Requires-Python: >=3.9
216
+ Description-Content-Type: text/markdown
217
+ License-File: LICENSE
218
+ Requires-Dist: aiohttp>=3.9.0
219
+ Requires-Dist: python-dotenv==1.0.0
220
+ Requires-Dist: tiktoken==0.5.1
221
+ Requires-Dist: httpx==0.25.1
222
+
223
+ ![PyPI - Version](https://img.shields.io/pypi/v/lionagi?labelColor=233476aa&color=231fc935) ![PyPI - Downloads](https://img.shields.io/pypi/dm/lionagi?labelColor=233476aa&color=231fc935) ![GitHub License](https://img.shields.io/github/license/lion-agi/lionagi?labelColor=233476aa&color=231fc935)
224
+
225
+
226
+
227
+ - PyPI: https://pypi.org/project/lionagi/
228
+ - Documentation: https://lionagi.readthedocs.io/en/latest/ (still a lot TODO)
229
+ - Website: TODO
230
+ - Discord: [Join Our Discord](https://discord.gg/7RGWqpSxze)
231
+
232
+
233
+ # LionAGI
234
+ **Towards Automated General Intelligence**
235
+
236
+ LionAGI is a Python package that combines data manipulation with AI tools, aiming to simplify the integration of advanced machine learning tools, such as Large Language Models (i.e. OpenAI's GPT), with production level data centric projects.
237
+
238
+ Install LionAGI with pip:
239
+
240
+ ```bash
241
+ pip install lionagi
242
+ ```
243
+ Download the `.env_template` file, input your OPENAI_API_KEY, save the file, rename as `.env` and put in your project's root directory.
244
+
245
+ ### Features
246
+
247
+ - Robust performance. LionAGI is written in almost pure python. With minimum external dependency (aiohttp, httpx, python-dotenv, tiktoken)
248
+ - Efficient data operations for reading, chunking, binning, writing, storing and managing data.
249
+ - Fast interaction with LLM services like OpenAI with configurable rate limiting concurrent API calls for maximum throughput.
250
+ - Create a production ready LLM application in hours. Intuitive workflow management to streamline and expedite the process from idea to market.
251
+
252
+ ---
253
+ Currently, LionAGI only natively support OpenAI API calls, support for other LLM providers as well as open source models will be integrated in future releases. LionAGI is designed to be async only, please check python documentation [here](https://docs.python.org/3/library/asyncio.html)
254
+
255
+
256
+ **Notice**:
257
+ * calling API with maximum throughput over large set of data with advanced models i.e. gpt-4 can get **EXPENSIVE IN JUST SECONDS**,
258
+ * please know what you are doing, and check the usage on OpenAI regularly
259
+ * default rate limits are set to be **tier 1** of OpenAI model `gpt-4-1104-preview`, please check the [OpenAI usage limit documentation](https://platform.openai.com/docs/guides/rate-limits?context=tier-free) you can modify token rate parameters to fit different use cases.
260
+ * Documentation is under process
261
+
262
+
263
+ ### Quick Start
264
+
265
+ The following example shows how to use LionAGI's `Session` object to interact with `gpt-4` model:
266
+
267
+ ```python
268
+ import lionagi as li
269
+
270
+ # define system messages, context and user instruction
271
+ system = "You are a helpful assistant designed to perform calculations."
272
+ instruction = {"Addition":"Add the two numbers together i.e. x+y"}
273
+ context = {"x": 10, "y": 5}
274
+
275
+ # Initialize a session with a system message
276
+ calculator = li.Session(system=system)
277
+
278
+ # run a LLM API call
279
+ result = await calculator.initiate(instruction=instruction,
280
+ context=context,
281
+ model="gpt-4-1106-preview")
282
+
283
+ print(f"Calculation Result: {result}")
284
+ ```
285
+
286
+ Visit our notebooks for our examples.
287
+
288
+ ### Community
289
+
290
+ We encourage contributions to LionAGI and invite you to enrich its features and capabilities. Engage with us and other community members [Join Our Discord](https://discord.gg/7RGWqpSxze)
291
+
292
+ ### Citation
293
+
294
+ When referencing LionAGI in your projects or research, please cite:
295
+
296
+ ```bibtex
297
+ @software{Li_LionAGI_2023,
298
+ author = {Haiyang Li},
299
+ month = {12},
300
+ year = {2023},
301
+ title = {LionAGI: Towards Automated General Intelligence},
302
+ url = {https://github.com/lion-agi/lionagi},
303
+ }
304
+ ```
305
+
306
+ ## Star History
307
+ ![Star History Chart](https://api.star-history.com/svg?repos=lion-agi/lionagi&type=Date)
308
+
309
+ ### Requirements
310
+ Python 3.9 or higher.
311
+
@@ -1,8 +1,12 @@
1
- ![GitHub License](https://img.shields.io/github/license/lion-agi/lionagi?labelColor=233476aa&color=231fc935) ![PyPI - Version](https://img.shields.io/pypi/v/lionagi?color=231fc935) ![PyPI - Downloads](https://img.shields.io/pypi/dm/lionagi?labelColor=%233476aa&color=%231fc935)
1
+ ![PyPI - Version](https://img.shields.io/pypi/v/lionagi?labelColor=233476aa&color=231fc935) ![PyPI - Downloads](https://img.shields.io/pypi/dm/lionagi?labelColor=233476aa&color=231fc935) ![GitHub License](https://img.shields.io/github/license/lion-agi/lionagi?labelColor=233476aa&color=231fc935)
2
+
3
+
2
4
 
3
5
  - PyPI: https://pypi.org/project/lionagi/
4
- - Documentation: TODO
6
+ - Documentation: https://lionagi.readthedocs.io/en/latest/ (still a lot TODO
5
7
  - Website: TODO
8
+ - Discord: [Join Our Discord](https://discord.gg/7RGWqpSxze)
9
+
6
10
 
7
11
  # LionAGI
8
12
  **Towards Automated General Intelligence**
@@ -61,7 +65,7 @@ Visit our notebooks for our examples.
61
65
 
62
66
  ### Community
63
67
 
64
- We encourage contributions to LionAGI and invite you to enrich its features and capabilities. Engage with us and other community members on [Discord](https://discord.gg/ACnynvvPjt)
68
+ We encourage contributions to LionAGI and invite you to enrich its features and capabilities. Engage with us and other community members [Join Our Discord](https://discord.gg/7RGWqpSxze)
65
69
 
66
70
  ### Citation
67
71
 
@@ -75,6 +79,11 @@ When referencing LionAGI in your projects or research, please cite:
75
79
  title = {LionAGI: Towards Automated General Intelligence},
76
80
  url = {https://github.com/lion-agi/lionagi},
77
81
  }
78
- ```
82
+ ```
83
+
84
+ ## Star History
85
+ ![Star History Chart](https://api.star-history.com/svg?repos=lion-agi/lionagi&type=Date)
86
+
79
87
  ### Requirements
80
88
  Python 3.9 or higher.
89
+
@@ -0,0 +1,9 @@
1
+ Template for the Read the Docs tutorial
2
+ =======================================
3
+
4
+ This GitHub template includes fictional Python library
5
+ with some basic Sphinx docs.
6
+
7
+ Read the tutorial here:
8
+
9
+ https://docs.readthedocs.io/en/stable/tutorial/
@@ -16,7 +16,6 @@ Copyright 2023 HaiyangLi <ocean@lionagi.ai>
16
16
 
17
17
  import logging
18
18
  from .version import __version__
19
- from .config import *
20
19
  from .session import *
21
20
  from .utils import *
22
21
  from .api import *
@@ -0,0 +1,7 @@
1
+ from .oai_service import OpenAIService
2
+ from .oai_config import oai_llmconfig
3
+
4
+ __all__ = [
5
+ "oai_llmconfig",
6
+ "OpenAIService",
7
+ ]
@@ -1,7 +1,7 @@
1
- llmconfig = {
1
+ oai_llmconfig = {
2
2
  "model": "gpt-4-1106-preview",
3
3
  "frequency_penalty": 0,
4
- "max_tokens": 4000,
4
+ "max_tokens": None,
5
5
  "n": 1,
6
6
  "presence_penalty": 0,
7
7
  "response_format": {"type": "text"},
@@ -1,8 +1,12 @@
1
+ import os
2
+ import dotenv
1
3
  import asyncio
2
4
  import logging
3
5
  import tiktoken
4
6
  from typing import Optional, NoReturn, Dict, Any
5
7
 
8
+ dotenv.load_dotenv()
9
+
6
10
  from ..utils.api_util import AsyncQueue, StatusTracker, RateLimiter, BaseAPIService
7
11
 
8
12
 
@@ -32,7 +36,8 @@ class OpenAIRateLimiter(RateLimiter):
32
36
  max_tokens_per_minute (int): The maximum number of tokens that can accumulate per minute.
33
37
  """
34
38
  super().__init__(max_requests_per_minute, max_tokens_per_minute)
35
- self.rate_limit_replenisher_task = asyncio.create_task(self.rate_limit_replenisher())
39
+ if not os.getenv('env_readthedocs'):
40
+ self.rate_limit_replenisher_task = asyncio.create_task(self.rate_limit_replenisher())
36
41
 
37
42
  async def rate_limit_replenisher(self) -> NoReturn:
38
43
  """
@@ -52,8 +57,8 @@ class OpenAIRateLimiter(RateLimiter):
52
57
  self.available_request_capacity = self.max_requests_per_minute
53
58
  self.available_token_capacity = self.max_tokens_per_minute
54
59
 
55
- def calculate_num_token(self, payload: Dict[str, Any],
56
- api_endpoint: str, token_encoding_name: str) -> int:
60
+ def calculate_num_token(self, payload: Dict[str, Any] =None,
61
+ api_endpoint: str =None, token_encoding_name: str =None) -> int:
57
62
  """
58
63
  Calculates the number of tokens required for a request based on the payload and API endpoint.
59
64
 
@@ -143,11 +148,13 @@ class OpenAIService(BaseAPIService):
143
148
 
144
149
  def __init__(
145
150
  self,
146
- api_key: str,
147
- token_encoding_name: str,
148
- max_attempts: int,
151
+ api_key: str = None,
152
+ token_encoding_name: str = "cl100k_base",
153
+ max_attempts: int = 3,
154
+ max_requests_per_minute: int = 500,
155
+ max_tokens_per_minute: int = 150_000,
156
+ ratelimiter = OpenAIRateLimiter,
149
157
  status_tracker: Optional[StatusTracker] = None,
150
- rate_limiter: Optional[OpenAIRateLimiter] = None,
151
158
  queue: Optional[AsyncQueue] = None
152
159
  ):
153
160
  """
@@ -172,10 +179,13 @@ class OpenAIService(BaseAPIService):
172
179
  ... )
173
180
  # Service is configured for interacting with OpenAI API.
174
181
  """
182
+ api_key = api_key or os.getenv("OPENAI_API_KEY")
175
183
  super().__init__(api_key, token_encoding_name, max_attempts,
176
- status_tracker, rate_limiter, queue)
184
+ max_requests_per_minute, max_tokens_per_minute,
185
+ ratelimiter, status_tracker, queue)
186
+
177
187
 
178
- async def call_api(self, session, request_url: str, payload: Dict[str, any]) -> Optional[Dict[str, any]]:
188
+ async def call_api(self, http_session, endpoint, payload: Dict[str, any] =None) -> Optional[Dict[str, any]]:
179
189
  """
180
190
  Call an OpenAI API endpoint with a specific payload and handle the response.
181
191
 
@@ -199,12 +209,13 @@ class OpenAIService(BaseAPIService):
199
209
  ... )
200
210
  # Calls the specified API endpoint with the given payload.
201
211
  """
212
+ endpoint = self.api_endpoint_from_url(self.base_url+endpoint)
213
+
202
214
  while True:
203
215
  if self.rate_limiter.available_request_capacity < 1 or self.rate_limiter.available_token_capacity < 10: # Minimum token count
204
216
  await asyncio.sleep(1) # Wait for capacity
205
217
  continue
206
218
 
207
- endpoint = self.api_endpoint_from_url(request_url)
208
219
  required_tokens = self.rate_limiter.calculate_num_token(payload, endpoint, self.token_encoding_name)
209
220
 
210
221
  if self.rate_limiter.available_token_capacity >= required_tokens:
@@ -216,8 +227,8 @@ class OpenAIService(BaseAPIService):
216
227
 
217
228
  while attempts_left > 0:
218
229
  try:
219
- async with session.post(
220
- url=request_url, headers=request_headers, json=payload
230
+ async with http_session.post(
231
+ url=(self.base_url+endpoint), headers=request_headers, json=payload
221
232
  ) as response:
222
233
  response_json = await response.json()
223
234
 
@@ -239,4 +250,3 @@ class OpenAIService(BaseAPIService):
239
250
  break
240
251
  else:
241
252
  await asyncio.sleep(1) # Wait for token capacity
242
-
@@ -0,0 +1,5 @@
1
+ from .session import Session
2
+
3
+ __all__ = [
4
+ "Session",
5
+ ]
@@ -0,0 +1,95 @@
1
+ from .message import Message
2
+
3
+ class Conversation:
4
+ """
5
+ A class representing a conversation between users and the assistant.
6
+
7
+ This class manages the exchange of messages within a conversation, including system settings,
8
+ user instructions, and assistant responses.
9
+
10
+ Attributes:
11
+ response_counts (int): The count of assistant responses in the conversation.
12
+ messages (list): A list to store messages in the conversation.
13
+ msg (Message): An instance of the Message class for creating messages.
14
+ responses (list): A list to store assistant responses in the conversation.
15
+
16
+ Methods:
17
+ initiate_conversation(system, instruction, context=None, name=None):
18
+ Initiate a conversation with a system setting and user instruction.
19
+
20
+ add_messages(system, instruction, context=None, response=None, tool=None, name=None):
21
+ Add messages to the conversation, including system setting, user instruction, and assistant response.
22
+
23
+ change_system(system):
24
+ Change the system setting in the conversation.
25
+
26
+ keep_last_n_exchanges(n: int):
27
+ Keep the last n exchanges in the conversation.
28
+ """
29
+ response_counts = 0
30
+
31
+ def __init__(self, messages=None) -> None:
32
+ """
33
+ Initialize a Conversation object.
34
+
35
+ Parameters:
36
+ messages (list): A list of messages to initialize the conversation. Default is None.
37
+
38
+ """
39
+ self.messages = messages or []
40
+ self.msg = Message()
41
+ self.responses = []
42
+
43
+ def initiate_conversation(self, system, instruction, context=None, name=None):
44
+ """
45
+ Initiate a conversation with a system setting and user instruction.
46
+
47
+ Parameters:
48
+ system (str): The system setting for the conversation.
49
+ instruction (str): The user instruction to initiate the conversation.
50
+ context (dict): Additional context for the conversation. Default is None.
51
+ name (str): The name associated with the user. Default is None.
52
+ """
53
+ self.messages, self.responses = [], []
54
+ self.add_messages(system=system)
55
+ self.add_messages(instruction=instruction, context=context, name=name)
56
+
57
+ # modify the message adding to accomodate tools
58
+ def add_messages(self, system=None, instruction=None, context=None, response=None, tool=None, name=None):
59
+ """
60
+ Add messages to the conversation, including system setting, user instruction, and assistant response.
61
+
62
+ Parameters:
63
+ system (str): The system setting for the message. Default is None.
64
+ instruction (str): The instruction content for the message. Default is None.
65
+ context (dict): Additional context for the message. Default is None.
66
+ response (dict): The response content for the message. Default is None.
67
+ tool (dict): The tool information for the message. Default is None.
68
+ name (str): The name associated with the message. Default is None.
69
+ """
70
+ msg = self.msg(system=system, instruction=instruction, context=context, response=response, tool=tool, name=name)
71
+ self.messages.append(msg)
72
+
73
+ def change_system(self, system):
74
+ """
75
+ Change the system setting in the conversation.
76
+
77
+ Parameters:
78
+ system (str): The new system setting for the conversation.
79
+ """
80
+ self.messages[0] = self.msg(system=system)
81
+
82
+ def keep_last_n_exchanges(self, n: int):
83
+ """
84
+ Keep the last n exchanges in the conversation.
85
+
86
+ Parameters:
87
+ n (int): The number of exchanges to keep.
88
+ """
89
+ # keep last n_exchanges, one exchange is marked by one assistant response
90
+ response_indices = [
91
+ index for index, message in enumerate(self.messages[1:]) if message["role"] == "assistant"
92
+ ]
93
+ if len(response_indices) >= n:
94
+ first_index_to_keep = response_indices[-n] + 1
95
+ self.messages = [self.system] + self.messages[first_index_to_keep:]