augllm 1.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- augllm-1.0/LICENSE +201 -0
- augllm-1.0/PKG-INFO +82 -0
- augllm-1.0/README.md +69 -0
- augllm-1.0/augllm/__init__.py +10 -0
- augllm-1.0/augllm/augmented_llm.py +273 -0
- augllm-1.0/augllm/function_calling.py +207 -0
- augllm-1.0/augllm/image_controller.py +144 -0
- augllm-1.0/augllm/llm_interface.py +42 -0
- augllm-1.0/augllm/make_image_paths.py +47 -0
- augllm-1.0/augllm/prompt_builder.py +48 -0
- augllm-1.0/augllm/tool.py +37 -0
- augllm-1.0/augllm/tool_handler.py +150 -0
- augllm-1.0/augllm.egg-info/PKG-INFO +82 -0
- augllm-1.0/augllm.egg-info/SOURCES.txt +20 -0
- augllm-1.0/augllm.egg-info/dependency_links.txt +1 -0
- augllm-1.0/augllm.egg-info/requires.txt +6 -0
- augllm-1.0/augllm.egg-info/top_level.txt +2 -0
- augllm-1.0/setup.cfg +4 -0
- augllm-1.0/setup.py +46 -0
- augllm-1.0/test/__init__.py +0 -0
- augllm-1.0/test/test_chat.py +52 -0
- augllm-1.0/test/test_image.py +47 -0
augllm-1.0/LICENSE
ADDED
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright 2025 Shun Ogawa (a.k.a. "ToPo")
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
augllm-1.0/PKG-INFO
ADDED
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
Metadata-Version: 2.1
|
|
2
|
+
Name: augllm
|
|
3
|
+
Version: 1.0
|
|
4
|
+
Summary: ('A library for augmenting large language models',)
|
|
5
|
+
Home-page: https://github.com/ToPo-ToPo-ToPo/augllm
|
|
6
|
+
Author: Shun Ogawa (a.k.a. "ToPo")
|
|
7
|
+
License: Apache License Version 2.0
|
|
8
|
+
Classifier: Programming Language :: Python :: 3
|
|
9
|
+
Classifier: License :: OSI Approved :: Apache Software License
|
|
10
|
+
Requires-Python: >=3.11
|
|
11
|
+
Description-Content-Type: text/markdown
|
|
12
|
+
License-File: LICENSE
|
|
13
|
+
|
|
14
|
+
# augllm
|
|
15
|
+
|
|
16
|
+
[English README is here](./README.en.md)
|
|
17
|
+
|
|
18
|
+
**augllm** は、Ollama を用いた拡張型(Augmented)大規模言語モデル(LLM)操作のためのラッパーライブラリです。
|
|
19
|
+
Function Calling による外部ツール利用のためのインターフェースを提供します。
|
|
20
|
+
ただし、ツール本体の実装は含まず、利用者が必要に応じて外部実装を組み込む形を想定しています。
|
|
21
|
+
|
|
22
|
+
リポジトリ:
|
|
23
|
+
https://github.com/ToPo‑ToPo‑ToPo/augllm
|
|
24
|
+
|
|
25
|
+
## 目次
|
|
26
|
+
|
|
27
|
+
1. 特長 / 概要
|
|
28
|
+
2. 前提条件
|
|
29
|
+
3. インストール方法
|
|
30
|
+
4. 使い方
|
|
31
|
+
- サンプルプログラム
|
|
32
|
+
- Function Calling との連携
|
|
33
|
+
6. ライセンス
|
|
34
|
+
|
|
35
|
+
## 1. 特長 / 概要
|
|
36
|
+
|
|
37
|
+
- Ollama を通じて LLM(ローカルまたはクラウド上)とやり取り
|
|
38
|
+
- Function Calling(関数呼び出し)形式でのツール連携をサポート
|
|
39
|
+
- ツールは抽象インターフェースとして定義されており、具体的な実装(API 呼び出し、ローカルスクリプト実行など)はユーザーが自由に実装可能
|
|
40
|
+
- 拡張性重視:カスタムツール、チェーン処理、プロンプト設計などへの組み込み容易
|
|
41
|
+
|
|
42
|
+
## 2. 前提条件
|
|
43
|
+
|
|
44
|
+
- Python 3.8 以上
|
|
45
|
+
- Ollama コマンドラインや API クライアントが動作可能な環境
|
|
46
|
+
|
|
47
|
+
## 3. インストール方法
|
|
48
|
+
1. 仮想環境の作成と起動
|
|
49
|
+
|
|
50
|
+
以下を実行し、仮想環境を作成します。
|
|
51
|
+
```
|
|
52
|
+
python -m venv env
|
|
53
|
+
```
|
|
54
|
+
|
|
55
|
+
仮想環境を起動します。Macの場合は以下を実行します。
|
|
56
|
+
```
|
|
57
|
+
source env/bin/activate
|
|
58
|
+
```
|
|
59
|
+
|
|
60
|
+
2. ライブラリのインストール
|
|
61
|
+
|
|
62
|
+
```bash
|
|
63
|
+
pip install .
|
|
64
|
+
```
|
|
65
|
+
|
|
66
|
+
## 4. 使い方
|
|
67
|
+
|
|
68
|
+
### サンプルプログラム
|
|
69
|
+
リポジトリ内に `test/` ディレクトリがあります。中の2つのファイルを参考にしてください。
|
|
70
|
+
|
|
71
|
+
### Function Calling との連携
|
|
72
|
+
|
|
73
|
+
1. プロンプト内で、ツール呼び出しを期待する関数署名を与える
|
|
74
|
+
2. モデルから返ってきた関数呼び出し要求(ツール名 + 引数)を受け取り
|
|
75
|
+
3. 対応ツールインターフェースの `run(...)` を呼び出し、結果を受け取り
|
|
76
|
+
4. 結果をモデルに返して最終応答を得る
|
|
77
|
+
|
|
78
|
+
## 5. ライセンス
|
|
79
|
+
|
|
80
|
+
このプロジェクトは **Apache‑2.0 ライセンス** のもとで公開されています。
|
|
81
|
+
詳細は、[LICENSE](https://github.com/ToPo-ToPo-ToPo/augllm/blob/main/LICENSE)ファイルを確認してください。
|
|
82
|
+
|
augllm-1.0/README.md
ADDED
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
# augllm
|
|
2
|
+
|
|
3
|
+
[English README is here](./README.en.md)
|
|
4
|
+
|
|
5
|
+
**augllm** は、Ollama を用いた拡張型(Augmented)大規模言語モデル(LLM)操作のためのラッパーライブラリです。
|
|
6
|
+
Function Calling による外部ツール利用のためのインターフェースを提供します。
|
|
7
|
+
ただし、ツール本体の実装は含まず、利用者が必要に応じて外部実装を組み込む形を想定しています。
|
|
8
|
+
|
|
9
|
+
リポジトリ:
|
|
10
|
+
https://github.com/ToPo‑ToPo‑ToPo/augllm
|
|
11
|
+
|
|
12
|
+
## 目次
|
|
13
|
+
|
|
14
|
+
1. 特長 / 概要
|
|
15
|
+
2. 前提条件
|
|
16
|
+
3. インストール方法
|
|
17
|
+
4. 使い方
|
|
18
|
+
- サンプルプログラム
|
|
19
|
+
- Function Calling との連携
|
|
20
|
+
6. ライセンス
|
|
21
|
+
|
|
22
|
+
## 1. 特長 / 概要
|
|
23
|
+
|
|
24
|
+
- Ollama を通じて LLM(ローカルまたはクラウド上)とやり取り
|
|
25
|
+
- Function Calling(関数呼び出し)形式でのツール連携をサポート
|
|
26
|
+
- ツールは抽象インターフェースとして定義されており、具体的な実装(API 呼び出し、ローカルスクリプト実行など)はユーザーが自由に実装可能
|
|
27
|
+
- 拡張性重視:カスタムツール、チェーン処理、プロンプト設計などへの組み込み容易
|
|
28
|
+
|
|
29
|
+
## 2. 前提条件
|
|
30
|
+
|
|
31
|
+
- Python 3.8 以上
|
|
32
|
+
- Ollama コマンドラインや API クライアントが動作可能な環境
|
|
33
|
+
|
|
34
|
+
## 3. インストール方法
|
|
35
|
+
1. 仮想環境の作成と起動
|
|
36
|
+
|
|
37
|
+
以下を実行し、仮想環境を作成します。
|
|
38
|
+
```
|
|
39
|
+
python -m venv env
|
|
40
|
+
```
|
|
41
|
+
|
|
42
|
+
仮想環境を起動します。Macの場合は以下を実行します。
|
|
43
|
+
```
|
|
44
|
+
source env/bin/activate
|
|
45
|
+
```
|
|
46
|
+
|
|
47
|
+
2. ライブラリのインストール
|
|
48
|
+
|
|
49
|
+
```bash
|
|
50
|
+
pip install .
|
|
51
|
+
```
|
|
52
|
+
|
|
53
|
+
## 4. 使い方
|
|
54
|
+
|
|
55
|
+
### サンプルプログラム
|
|
56
|
+
リポジトリ内に `test/` ディレクトリがあります。中の2つのファイルを参考にしてください。
|
|
57
|
+
|
|
58
|
+
### Function Calling との連携
|
|
59
|
+
|
|
60
|
+
1. プロンプト内で、ツール呼び出しを期待する関数署名を与える
|
|
61
|
+
2. モデルから返ってきた関数呼び出し要求(ツール名 + 引数)を受け取り
|
|
62
|
+
3. 対応ツールインターフェースの `run(...)` を呼び出し、結果を受け取り
|
|
63
|
+
4. 結果をモデルに返して最終応答を得る
|
|
64
|
+
|
|
65
|
+
## 5. ライセンス
|
|
66
|
+
|
|
67
|
+
このプロジェクトは **Apache‑2.0 ライセンス** のもとで公開されています。
|
|
68
|
+
詳細は、[LICENSE](https://github.com/ToPo-ToPo-ToPo/augllm/blob/main/LICENSE)ファイルを確認してください。
|
|
69
|
+
|
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
3
|
+
from typing import Optional
|
|
4
|
+
from .make_image_paths import make_image_paths
|
|
5
|
+
from .function_calling import register_tools, generate_system_prompt
|
|
6
|
+
from .tool_handler import select_tool
|
|
7
|
+
#===================================================================================
|
|
8
|
+
# Coreの部分
|
|
9
|
+
#===================================================================================
|
|
10
|
+
class AugmentedLLM:
|
|
11
|
+
|
|
12
|
+
#---------------------------------------------------------------
|
|
13
|
+
# パラメータの初期化
|
|
14
|
+
#---------------------------------------------------------------
|
|
15
|
+
def __init__(self, llm, prompt_builder, cache_dir, tools=None, tool_selector_name="gemma3:4b"):
|
|
16
|
+
|
|
17
|
+
# LLMの設定
|
|
18
|
+
self.llm = llm
|
|
19
|
+
self.prompt_builder = prompt_builder
|
|
20
|
+
|
|
21
|
+
# ツールの定義
|
|
22
|
+
self.tool_dict = register_tools(tools) if tools is not None else None
|
|
23
|
+
self.tool_selector_name = tool_selector_name
|
|
24
|
+
|
|
25
|
+
# 内部データの保存先
|
|
26
|
+
self.cache_dir = cache_dir
|
|
27
|
+
|
|
28
|
+
# 結果保存変数
|
|
29
|
+
self.report_text = None
|
|
30
|
+
self.report_images = None
|
|
31
|
+
self.report_data = None
|
|
32
|
+
|
|
33
|
+
#---------------------------------------------------------------
|
|
34
|
+
# インスタンスを生成する関数
|
|
35
|
+
#---------------------------------------------------------------
|
|
36
|
+
@classmethod
|
|
37
|
+
def from_config(cls, agent_info, llm, prompt_builder, tools=None):
|
|
38
|
+
return cls(
|
|
39
|
+
name=agent_info['name'],
|
|
40
|
+
llm=llm,
|
|
41
|
+
prompt_builder=prompt_builder,
|
|
42
|
+
tools=tools,
|
|
43
|
+
max_chat_history=agent_info['max_chat_history']
|
|
44
|
+
)
|
|
45
|
+
|
|
46
|
+
#---------------------------------------------------------------
|
|
47
|
+
#
|
|
48
|
+
#---------------------------------------------------------------
|
|
49
|
+
def get_name(self) -> str:
|
|
50
|
+
return self.name
|
|
51
|
+
|
|
52
|
+
#---------------------------------------------------------------
|
|
53
|
+
# ロードしたモデルを止める
|
|
54
|
+
#---------------------------------------------------------------
|
|
55
|
+
def free_model(self):
|
|
56
|
+
self.llm.free_model()
|
|
57
|
+
|
|
58
|
+
#---------------------------------------------------------------
|
|
59
|
+
# ツール実行結果を整形して、LLMに渡すための最終的なメッセージを作成
|
|
60
|
+
#---------------------------------------------------------------
|
|
61
|
+
def build_messages_with_tool_result(self, system_prompt, tool_execution_results, memory, local_history):
|
|
62
|
+
|
|
63
|
+
# 初期化
|
|
64
|
+
tool_results_summary_for_llm: Optional[str] = None
|
|
65
|
+
|
|
66
|
+
# ツールの結果が何かある場合 YAML関連の応答 (コールあり、空コール、または処理中エラー)
|
|
67
|
+
if tool_execution_results is not None:
|
|
68
|
+
|
|
69
|
+
# 実際にツールコールがあったか、処理中エラーがあった
|
|
70
|
+
if tool_execution_results:
|
|
71
|
+
|
|
72
|
+
# ツールの実行結果を整理
|
|
73
|
+
formatted_results_list = []
|
|
74
|
+
for res in tool_execution_results:
|
|
75
|
+
|
|
76
|
+
# データ取得
|
|
77
|
+
func_name = res["name"]
|
|
78
|
+
result_data = res["result"] # これはstatus, data, message を含む辞書
|
|
79
|
+
|
|
80
|
+
# dataフィールドはmessageに含めるか、必要に応じて別途整形してLLMに渡す
|
|
81
|
+
status = result_data.get("status", "unknown")
|
|
82
|
+
message = result_data.get("message", "結果メッセージなし")
|
|
83
|
+
images = result_data.get("images", None) # ツールを実行した結果、画像が戻る場合がある
|
|
84
|
+
|
|
85
|
+
# ツールの実行結果に関する追加プロンプト
|
|
86
|
+
if status == "success":
|
|
87
|
+
formatted_results_list.append(f"- {message}")
|
|
88
|
+
# ツールの実行結果を無視する場合(検索したけど該当しなかったなど)
|
|
89
|
+
elif status == "ignore":
|
|
90
|
+
pass
|
|
91
|
+
# Error or unknown
|
|
92
|
+
else:
|
|
93
|
+
print(f"- '{func_name}' の処理中に問題が発生しました。: {message}")
|
|
94
|
+
|
|
95
|
+
# ツールの実行結果がある場合はサマリーを作成
|
|
96
|
+
if formatted_results_list:
|
|
97
|
+
tool_results_summary_for_llm = "以下の内部情報に基づき回答してください。:\n" + "\n".join(formatted_results_list)
|
|
98
|
+
|
|
99
|
+
# システムプロンプトの指示に従い、ツール結果を 'user' ロールで履歴に追加
|
|
100
|
+
if tool_results_summary_for_llm:
|
|
101
|
+
# 文章の追加
|
|
102
|
+
local_history[0]["content"] += tool_results_summary_for_llm
|
|
103
|
+
# 画像の追加
|
|
104
|
+
if images:
|
|
105
|
+
#
|
|
106
|
+
image_paths = []
|
|
107
|
+
# 画像のパスの取得
|
|
108
|
+
query_image_paths = make_image_paths(user_images=images, cache_dir=self.cache_dir)
|
|
109
|
+
image_paths.extend(query_image_paths)
|
|
110
|
+
# メッセージに追加
|
|
111
|
+
local_history[0]["images"] = image_paths
|
|
112
|
+
|
|
113
|
+
# 最終応答のためのメッセージリストを作成
|
|
114
|
+
# historyには、ユーザープロンプト、LLMのツール試行応答、ツール結果の要約(あれば) が含まれる
|
|
115
|
+
messages = [system_prompt] + memory + local_history
|
|
116
|
+
|
|
117
|
+
#
|
|
118
|
+
return messages
|
|
119
|
+
|
|
120
|
+
#---------------------------------------------------------------
|
|
121
|
+
# LLMに渡すための最終的なメッセージを作成
|
|
122
|
+
#---------------------------------------------------------------
|
|
123
|
+
def build_messages(self, system_prompt, memory, local_history):
|
|
124
|
+
return [system_prompt] + memory + local_history
|
|
125
|
+
|
|
126
|
+
#---------------------------------------------------------------
|
|
127
|
+
# LLMに渡すための最終的なメッセージを作成
|
|
128
|
+
#---------------------------------------------------------------
|
|
129
|
+
def build_user_message(self, text, images=None):
|
|
130
|
+
|
|
131
|
+
# テキストの入力
|
|
132
|
+
user_message = {
|
|
133
|
+
"role": "user",
|
|
134
|
+
"content": text
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
# 入力画像がある場合 通常の画像データ->画像のパスに変換
|
|
138
|
+
if images:
|
|
139
|
+
#
|
|
140
|
+
image_paths = []
|
|
141
|
+
# 画像のパスの取得
|
|
142
|
+
query_image_paths = make_image_paths(user_images=images, cache_dir=self.cache_dir)
|
|
143
|
+
image_paths.extend(query_image_paths)
|
|
144
|
+
# メッセージに追加
|
|
145
|
+
user_message["images"] = image_paths
|
|
146
|
+
|
|
147
|
+
return user_message
|
|
148
|
+
|
|
149
|
+
#---------------------------------------------------------------
|
|
150
|
+
# 回答を生成
|
|
151
|
+
#---------------------------------------------------------------
|
|
152
|
+
def respond(self, user_text, user_images=None, memory=[], stream=False):
|
|
153
|
+
|
|
154
|
+
# ユーザーの入力を整形
|
|
155
|
+
query_message = self.build_user_message(
|
|
156
|
+
text=user_text,
|
|
157
|
+
images=user_images
|
|
158
|
+
)
|
|
159
|
+
|
|
160
|
+
# 初期化
|
|
161
|
+
messages = None
|
|
162
|
+
local_history = None
|
|
163
|
+
|
|
164
|
+
# 何かツールがある場合
|
|
165
|
+
if self.tool_dict:
|
|
166
|
+
|
|
167
|
+
# ルール呼び出し機能を持ったシステムプロンプトを作成
|
|
168
|
+
tool_select_prompt = generate_system_prompt(functions=self.tool_dict)
|
|
169
|
+
tool_select_system_prompt = {
|
|
170
|
+
"role": "system",
|
|
171
|
+
"content": f"{tool_select_prompt}"
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
# LLMでツールを呼び出し、結果を取得
|
|
175
|
+
tool_execution_results = select_tool(
|
|
176
|
+
llm=self.llm,
|
|
177
|
+
tool_dict=self.tool_dict,
|
|
178
|
+
system_prompt=tool_select_system_prompt,
|
|
179
|
+
user_message=query_message
|
|
180
|
+
)
|
|
181
|
+
|
|
182
|
+
# 最終的なメッセージ作成のためlocal_historyを初期化
|
|
183
|
+
local_history = [query_message]
|
|
184
|
+
|
|
185
|
+
# 最終的なメッセージに対するシステムプロンプト
|
|
186
|
+
system_prompt={
|
|
187
|
+
"role": "system",
|
|
188
|
+
"content": f"{self.prompt_builder.system_prompt_text}"
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
# ツールの実行結果の整理と最終的なメッセージを作成
|
|
192
|
+
# local_historyを更新
|
|
193
|
+
messages = self.build_messages_with_tool_result(
|
|
194
|
+
system_prompt=system_prompt,
|
|
195
|
+
tool_execution_results=tool_execution_results,
|
|
196
|
+
memory=memory,
|
|
197
|
+
local_history=local_history
|
|
198
|
+
)
|
|
199
|
+
# ツールが全く定義されていない場合 -> 通常の回答生成
|
|
200
|
+
else:
|
|
201
|
+
# local_historyを初期化
|
|
202
|
+
local_history = [query_message]
|
|
203
|
+
|
|
204
|
+
# システムプロンプトを作成
|
|
205
|
+
system_prompt = {
|
|
206
|
+
"role": "system",
|
|
207
|
+
"content": f"{self.prompt_builder.system_prompt_text}"
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
# 最終的なメッセージを作成
|
|
211
|
+
messages = self.build_messages(
|
|
212
|
+
system_prompt=system_prompt,
|
|
213
|
+
memory=memory,
|
|
214
|
+
local_history=local_history
|
|
215
|
+
)
|
|
216
|
+
|
|
217
|
+
# 最終的な回答を生成
|
|
218
|
+
full_reply = ""
|
|
219
|
+
# ストリーミング出力
|
|
220
|
+
if stream:
|
|
221
|
+
found = False # 何か返されたか確認
|
|
222
|
+
for chunk in self._stream_llm_response(messages=messages):
|
|
223
|
+
found = True
|
|
224
|
+
full_reply += chunk
|
|
225
|
+
yield chunk
|
|
226
|
+
if not found:
|
|
227
|
+
yield "[ストリーミング応答が得られませんでした]"
|
|
228
|
+
# 通常の生成
|
|
229
|
+
else:
|
|
230
|
+
#
|
|
231
|
+
try:
|
|
232
|
+
reply = self.llm.chat(messages=messages)["message"]["content"]
|
|
233
|
+
except Exception as e:
|
|
234
|
+
yield f"[エラー: {str(e)}]"
|
|
235
|
+
return
|
|
236
|
+
#
|
|
237
|
+
full_reply = reply
|
|
238
|
+
yield full_reply
|
|
239
|
+
|
|
240
|
+
# 報告用のデータ作成
|
|
241
|
+
self.report_text = f"{full_reply}"
|
|
242
|
+
self.report_images = None
|
|
243
|
+
self.report_images = local_history[0].get("images", None)
|
|
244
|
+
self.report_data = None
|
|
245
|
+
|
|
246
|
+
#---------------------------------------------------------------
|
|
247
|
+
#
|
|
248
|
+
#---------------------------------------------------------------
|
|
249
|
+
def _stream_llm_response(self, messages):
|
|
250
|
+
try:
|
|
251
|
+
# 回答を生成
|
|
252
|
+
generator = self.llm.chat(messages=messages, stream=True)
|
|
253
|
+
if generator is None:
|
|
254
|
+
yield "[エラー: モデルがストリーミング応答を返しませんでした]"
|
|
255
|
+
return
|
|
256
|
+
#
|
|
257
|
+
any_chunk = False
|
|
258
|
+
for chunk in generator:
|
|
259
|
+
any_chunk = True
|
|
260
|
+
# 通常生成
|
|
261
|
+
if "message" in chunk and "content" in chunk["message"]:
|
|
262
|
+
yield chunk["message"]["content"]
|
|
263
|
+
|
|
264
|
+
# エラー情報をストリームで返す
|
|
265
|
+
elif "error" in chunk:
|
|
266
|
+
print(f"Error from llm response: {chunk['error']}")
|
|
267
|
+
yield f"\n[エラー: {chunk['error']}]"
|
|
268
|
+
|
|
269
|
+
if not any_chunk:
|
|
270
|
+
yield "[エラー: モデルからの応答が空でした]"
|
|
271
|
+
|
|
272
|
+
except Exception as e:
|
|
273
|
+
yield f"[エラー発生: {str(e)}]"
|