deploy: 79bf906

modelscope · Aug 28, 2024 · fb5c7d6 · fb5c7d6
1 parent cb14cde
commit fb5c7d6
Show file tree

Hide file tree

Showing 182 changed files with 1,380 additions and 5,574 deletions.
diff --git a/en/.doctrees/agentscope.agents.doctree b/en/.doctrees/agentscope.agents.doctree
diff --git a/en/.doctrees/agentscope.agents.text_to_image_agent.doctree b/en/.doctrees/agentscope.agents.text_to_image_agent.doctree
diff --git a/en/.doctrees/agentscope.doctree b/en/.doctrees/agentscope.doctree
diff --git a/en/.doctrees/agentscope.file_manager.doctree b/en/.doctrees/agentscope.file_manager.doctree
diff --git a/en/.doctrees/agentscope.parsers.doctree b/en/.doctrees/agentscope.parsers.doctree
diff --git a/en/.doctrees/agentscope.parsers.json_object_parser.doctree b/en/.doctrees/agentscope.parsers.json_object_parser.doctree
diff --git a/en/.doctrees/agentscope.prompt.doctree b/en/.doctrees/agentscope.prompt.doctree
diff --git a/en/.doctrees/agentscope.service.doctree b/en/.doctrees/agentscope.service.doctree
diff --git a/en/.doctrees/agentscope.service.multi_modality.openai_services.doctree b/en/.doctrees/agentscope.service.multi_modality.openai_services.doctree
diff --git a/en/.doctrees/agentscope.test.doctree b/en/.doctrees/agentscope.test.doctree
diff --git a/en/.doctrees/agentscope.utils.common.doctree b/en/.doctrees/agentscope.utils.common.doctree
diff --git a/en/.doctrees/agentscope.utils.doctree b/en/.doctrees/agentscope.utils.doctree
diff --git a/en/.doctrees/agentscope.utils.tools.doctree b/en/.doctrees/agentscope.utils.tools.doctree
diff --git a/en/.doctrees/agentscope.web.workstation.workflow_node.doctree b/en/.doctrees/agentscope.web.workstation.workflow_node.doctree
diff --git a/en/.doctrees/environment.pickle b/en/.doctrees/environment.pickle
diff --git a/en/.doctrees/index.doctree b/en/.doctrees/index.doctree
diff --git a/en/.doctrees/tutorial/201-agent.doctree b/en/.doctrees/tutorial/201-agent.doctree
diff --git a/en/.doctrees/tutorial/206-prompt.doctree b/en/.doctrees/tutorial/206-prompt.doctree
diff --git a/en/_modules/agentscope/agents/text_to_image_agent.html b/en/_modules/agentscope/agents/text_to_image_agent.html
diff --git a/en/_modules/agentscope/logging.html b/en/_modules/agentscope/logging.html
@@ -122,10 +122,11 @@ <h1>Source code for agentscope.logging</h1><div class="highlight"><pre>
 
 <span class="kn">from</span> <span class="nn">loguru</span> <span class="kn">import</span> <span class="n">logger</span>
 
-<span class="kn">from</span> <span class="nn">.utils.tools</span> <span class="kn">import</span> <span class="n">_guess_type_by_extension</span>
+
 <span class="kn">from</span> <span class="nn">.message</span> <span class="kn">import</span> <span class="n">Msg</span>
 <span class="kn">from</span> <span class="nn">.serialize</span> <span class="kn">import</span> <span class="n">serialize</span>
 <span class="kn">from</span> <span class="nn">.studio._client</span> <span class="kn">import</span> <span class="n">_studio_client</span>
+<span class="kn">from</span> <span class="nn">.utils.common</span> <span class="kn">import</span> <span class="n">_guess_type_by_extension</span>
 <span class="kn">from</span> <span class="nn">.web.gradio.utils</span> <span class="kn">import</span> <span class="p">(</span>
     <span class="n">generate_image_from_name</span><span class="p">,</span>
     <span class="n">send_msg</span><span class="p">,</span>

diff --git a/en/_modules/agentscope/manager/_file.html b/en/_modules/agentscope/manager/_file.html
@@ -124,11 +124,13 @@ <h1>Source code for agentscope.manager._file</h1><div class="highlight"><pre>
 <span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
 <span class="kn">from</span> <span class="nn">PIL</span> <span class="kn">import</span> <span class="n">Image</span>
 
-<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">_download_file</span>
-<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">_hash_string</span>
-<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">_get_timestamp</span>
-<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">_generate_random_code</span>
-<span class="kn">from</span> <span class="nn">agentscope.constants</span> <span class="kn">import</span> <span class="p">(</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="p">(</span>
+    <span class="n">_download_file</span><span class="p">,</span>
+    <span class="n">_hash_string</span><span class="p">,</span>
+    <span class="n">_get_timestamp</span><span class="p">,</span>
+    <span class="n">_generate_random_code</span><span class="p">,</span>
+<span class="p">)</span>
+<span class="kn">from</span> <span class="nn">..constants</span> <span class="kn">import</span> <span class="p">(</span>
     <span class="n">_DEFAULT_SUBDIR_CODE</span><span class="p">,</span>
     <span class="n">_DEFAULT_SUBDIR_FILE</span><span class="p">,</span>
     <span class="n">_DEFAULT_SUBDIR_INVOKE</span><span class="p">,</span>
@@ -148,7 +150,13 @@ <h1>Source code for agentscope.manager._file</h1><div class="highlight"><pre>
     <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">embedding_model</span><span class="p">,</span> <span class="nb">dict</span><span class="p">):</span>
         <span class="c1"># Format the dict to avoid duplicate keys</span>
         <span class="n">embedding_model</span> <span class="o">=</span> <span class="n">json</span><span class="o">.</span><span class="n">dumps</span><span class="p">(</span><span class="n">embedding_model</span><span class="p">,</span> <span class="n">sort_keys</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
-    <span class="n">embedding_model_hash</span> <span class="o">=</span> <span class="n">_hash_string</span><span class="p">(</span><span class="n">embedding_model</span><span class="p">,</span> <span class="n">hash_method</span><span class="p">)</span>
+    <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">embedding_model</span><span class="p">,</span> <span class="nb">str</span><span class="p">):</span>
+        <span class="n">embedding_model_hash</span> <span class="o">=</span> <span class="n">_hash_string</span><span class="p">(</span><span class="n">embedding_model</span><span class="p">,</span> <span class="n">hash_method</span><span class="p">)</span>
+    <span class="k">else</span><span class="p">:</span>
+        <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span>
+            <span class="sa">f</span><span class="s2">&quot;The embedding model must be a string or a dict, got &quot;</span>
+            <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="nb">type</span><span class="p">(</span><span class="n">embedding_model</span><span class="p">)</span><span class="si">}</span><span class="s2">.&quot;</span><span class="p">,</span>
+        <span class="p">)</span>
 
     <span class="c1"># Calculate the embedding id by hashing the hash codes of the</span>
     <span class="c1"># original data and the embedding model</span>

diff --git a/en/_modules/agentscope/manager/_manager.html b/en/_modules/agentscope/manager/_manager.html
@@ -125,7 +125,7 @@ <h1>Source code for agentscope.manager._manager</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">._file</span> <span class="kn">import</span> <span class="n">FileManager</span>
 <span class="kn">from</span> <span class="nn">._model</span> <span class="kn">import</span> <span class="n">ModelManager</span>
 <span class="kn">from</span> <span class="nn">..logging</span> <span class="kn">import</span> <span class="n">LOG_LEVEL</span><span class="p">,</span> <span class="n">setup_logger</span>
-<span class="kn">from</span> <span class="nn">..utils.tools</span> <span class="kn">import</span> <span class="p">(</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="p">(</span>
     <span class="n">_generate_random_code</span><span class="p">,</span>
     <span class="n">_get_process_creation_time</span><span class="p">,</span>
     <span class="n">_get_timestamp</span><span class="p">,</span>

diff --git a/en/_modules/agentscope/manager/_monitor.html b/en/_modules/agentscope/manager/_monitor.html
@@ -126,7 +126,7 @@ <h1>Source code for agentscope.manager._monitor</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">sqlalchemy.orm</span> <span class="kn">import</span> <span class="n">sessionmaker</span>
 
 <span class="kn">from</span> <span class="nn">._file</span> <span class="kn">import</span> <span class="n">FileManager</span>
-<span class="kn">from</span> <span class="nn">..utils.tools</span> <span class="kn">import</span> <span class="n">_is_windows</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_is_windows</span>
 <span class="kn">from</span> <span class="nn">..constants</span> <span class="kn">import</span> <span class="p">(</span>
     <span class="n">_DEFAULT_SQLITE_DB_NAME</span><span class="p">,</span>
     <span class="n">_DEFAULT_TABLE_NAME_FOR_CHAT_AND_EMBEDDING</span><span class="p">,</span>

diff --git a/en/_modules/agentscope/message/msg.html b/en/_modules/agentscope/message/msg.html
@@ -129,7 +129,7 @@ <h1>Source code for agentscope.message.msg</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">loguru</span> <span class="kn">import</span> <span class="n">logger</span>
 
 <span class="kn">from</span> <span class="nn">..serialize</span> <span class="kn">import</span> <span class="n">is_serializable</span>
-<span class="kn">from</span> <span class="nn">..utils.tools</span> <span class="kn">import</span> <span class="p">(</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="p">(</span>
     <span class="n">_map_string_to_color_mark</span><span class="p">,</span>
     <span class="n">_get_timestamp</span><span class="p">,</span>
 <span class="p">)</span>

diff --git a/en/_modules/agentscope/message/placeholder.html b/en/_modules/agentscope/message/placeholder.html
@@ -125,7 +125,7 @@ <h1>Source code for agentscope.message.placeholder</h1><div class="highlight"><p
 <span class="kn">from</span> <span class="nn">.msg</span> <span class="kn">import</span> <span class="n">Msg</span>
 <span class="kn">from</span> <span class="nn">..rpc</span> <span class="kn">import</span> <span class="n">RpcAgentClient</span><span class="p">,</span> <span class="n">ResponseStub</span><span class="p">,</span> <span class="n">call_in_thread</span>
 <span class="kn">from</span> <span class="nn">..serialize</span> <span class="kn">import</span> <span class="n">deserialize</span><span class="p">,</span> <span class="n">is_serializable</span><span class="p">,</span> <span class="n">serialize</span>
-<span class="kn">from</span> <span class="nn">..utils.tools</span> <span class="kn">import</span> <span class="n">_is_web_url</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_is_web_url</span>
 
 
 <div class="viewcode-block" id="PlaceholderMessage">

diff --git a/en/_modules/agentscope/models/dashscope_model.html b/en/_modules/agentscope/models/dashscope_model.html
@@ -126,7 +126,7 @@ <h1>Source code for agentscope.models.dashscope_model</h1><div class="highlight"
 
 <span class="kn">from</span> <span class="nn">..manager</span> <span class="kn">import</span> <span class="n">FileManager</span>
 <span class="kn">from</span> <span class="nn">..message</span> <span class="kn">import</span> <span class="n">Msg</span>
-<span class="kn">from</span> <span class="nn">..utils.tools</span> <span class="kn">import</span> <span class="n">_convert_to_str</span><span class="p">,</span> <span class="n">_guess_type_by_extension</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_convert_to_str</span><span class="p">,</span> <span class="n">_guess_type_by_extension</span>
 
 <span class="k">try</span><span class="p">:</span>
     <span class="kn">import</span> <span class="nn">dashscope</span>

diff --git a/en/_modules/agentscope/models/gemini_model.html b/en/_modules/agentscope/models/gemini_model.html
@@ -123,9 +123,9 @@ <h1>Source code for agentscope.models.gemini_model</h1><div class="highlight"><p
 
 <span class="kn">from</span> <span class="nn">loguru</span> <span class="kn">import</span> <span class="n">logger</span>
 
-<span class="kn">from</span> <span class="nn">agentscope.message</span> <span class="kn">import</span> <span class="n">Msg</span>
-<span class="kn">from</span> <span class="nn">agentscope.models</span> <span class="kn">import</span> <span class="n">ModelWrapperBase</span><span class="p">,</span> <span class="n">ModelResponse</span>
-<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">_convert_to_str</span>
+<span class="kn">from</span> <span class="nn">..message</span> <span class="kn">import</span> <span class="n">Msg</span>
+<span class="kn">from</span> <span class="nn">..models</span> <span class="kn">import</span> <span class="n">ModelWrapperBase</span><span class="p">,</span> <span class="n">ModelResponse</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_convert_to_str</span>
 
 <span class="k">try</span><span class="p">:</span>
     <span class="kn">import</span> <span class="nn">google.generativeai</span> <span class="k">as</span> <span class="nn">genai</span>

diff --git a/en/_modules/agentscope/models/model.html b/en/_modules/agentscope/models/model.html
@@ -184,7 +184,7 @@ <h1>Source code for agentscope.models.model</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">..manager</span> <span class="kn">import</span> <span class="n">FileManager</span>
 <span class="kn">from</span> <span class="nn">..manager</span> <span class="kn">import</span> <span class="n">MonitorManager</span>
 <span class="kn">from</span> <span class="nn">..message</span> <span class="kn">import</span> <span class="n">Msg</span>
-<span class="kn">from</span> <span class="nn">..utils.tools</span> <span class="kn">import</span> <span class="n">_get_timestamp</span><span class="p">,</span> <span class="n">_convert_to_str</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_get_timestamp</span><span class="p">,</span> <span class="n">_convert_to_str</span>
 <span class="kn">from</span> <span class="nn">..constants</span> <span class="kn">import</span> <span class="n">_DEFAULT_MAX_RETRIES</span>
 <span class="kn">from</span> <span class="nn">..constants</span> <span class="kn">import</span> <span class="n">_DEFAULT_RETRY_INTERVAL</span>
 

diff --git a/en/_modules/agentscope/models/ollama_model.html b/en/_modules/agentscope/models/ollama_model.html
@@ -119,9 +119,9 @@ <h1>Source code for agentscope.models.ollama_model</h1><div class="highlight"><p
 <span class="kn">from</span> <span class="nn">abc</span> <span class="kn">import</span> <span class="n">ABC</span>
 <span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">Sequence</span><span class="p">,</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Optional</span><span class="p">,</span> <span class="n">List</span><span class="p">,</span> <span class="n">Union</span><span class="p">,</span> <span class="n">Generator</span>
 
-<span class="kn">from</span> <span class="nn">agentscope.message</span> <span class="kn">import</span> <span class="n">Msg</span>
-<span class="kn">from</span> <span class="nn">agentscope.models</span> <span class="kn">import</span> <span class="n">ModelWrapperBase</span><span class="p">,</span> <span class="n">ModelResponse</span>
-<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">_convert_to_str</span>
+<span class="kn">from</span> <span class="nn">..message</span> <span class="kn">import</span> <span class="n">Msg</span>
+<span class="kn">from</span> <span class="nn">..models</span> <span class="kn">import</span> <span class="n">ModelWrapperBase</span><span class="p">,</span> <span class="n">ModelResponse</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_convert_to_str</span>
 
 <span class="k">try</span><span class="p">:</span>
     <span class="kn">import</span> <span class="nn">ollama</span>

diff --git a/en/_modules/agentscope/models/openai_model.html b/en/_modules/agentscope/models/openai_model.html
@@ -137,7 +137,7 @@ <h1>Source code for agentscope.models.openai_model</h1><div class="highlight"><p
 <span class="kn">from</span> <span class="nn">.model</span> <span class="kn">import</span> <span class="n">ModelWrapperBase</span><span class="p">,</span> <span class="n">ModelResponse</span>
 <span class="kn">from</span> <span class="nn">..manager</span> <span class="kn">import</span> <span class="n">FileManager</span>
 <span class="kn">from</span> <span class="nn">..message</span> <span class="kn">import</span> <span class="n">Msg</span>
-<span class="kn">from</span> <span class="nn">..utils.tools</span> <span class="kn">import</span> <span class="n">_convert_to_str</span><span class="p">,</span> <span class="n">_to_openai_image_url</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_convert_to_str</span><span class="p">,</span> <span class="n">_to_openai_image_url</span>
 
 <span class="kn">from</span> <span class="nn">..utils.token_utils</span> <span class="kn">import</span> <span class="n">get_openai_max_length</span>
 

diff --git a/en/_modules/agentscope/models/response.html b/en/_modules/agentscope/models/response.html
@@ -119,7 +119,7 @@ <h1>Source code for agentscope.models.response</h1><div class="highlight"><pre>
 <span class="kn">import</span> <span class="nn">json</span>
 <span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">Optional</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">,</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Generator</span><span class="p">,</span> <span class="n">Union</span><span class="p">,</span> <span class="n">Tuple</span>
 
-<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">_is_json_serializable</span>
+<span class="kn">from</span> <span class="nn">..utils.common</span> <span class="kn">import</span> <span class="n">_is_json_serializable</span>
 
 
 <div class="viewcode-block" id="ModelResponse">
@@ -177,6 +177,11 @@ <h1>Source code for agentscope.models.response</h1><div class="highlight"><pre>
                     <span class="bp">self</span><span class="o">.</span><span class="n">_text</span> <span class="o">+=</span> <span class="n">chunk</span>
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_text</span>
 
+    <span class="nd">@text</span><span class="o">.</span><span class="n">setter</span>
+    <span class="k">def</span> <span class="nf">text</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">value</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
+<span class="w">        </span><span class="sd">&quot;&quot;&quot;Set the text field.&quot;&quot;&quot;</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_text</span> <span class="o">=</span> <span class="n">value</span>
+
     <span class="nd">@property</span>
     <span class="k">def</span> <span class="nf">stream</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Union</span><span class="p">[</span><span class="kc">None</span><span class="p">,</span> <span class="n">Generator</span><span class="p">[</span><span class="n">Tuple</span><span class="p">[</span><span class="nb">bool</span><span class="p">,</span> <span class="nb">str</span><span class="p">],</span> <span class="kc">None</span><span class="p">,</span> <span class="kc">None</span><span class="p">]]:</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Return the stream generator if it exists.&quot;&quot;&quot;</span>