deploy: ab46935

modelscope · Aug 7, 2024 · 0053e5f · 0053e5f
1 parent e7b9c23
commit 0053e5f
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 109 deletions.
diff --git a/en/.doctrees/agentscope.utils.tools.doctree b/en/.doctrees/agentscope.utils.tools.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/_modules/agentscope/models/post_model.html b/en/_modules/agentscope/models/post_model.html
@@ -332,14 +332,14 @@ <h1>Source code for agentscope.models.post_model</h1><div class="highlight"><pre
         <span class="p">)</span>
 
         <span class="c1"># OpenAI</span>
-        <span class="k">if</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gpt-&quot;</span><span class="p">):</span>
+        <span class="k">if</span> <span class="n">model_name</span> <span class="ow">and</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gpt-&quot;</span><span class="p">):</span>
             <span class="k">return</span> <span class="n">OpenAIChatWrapper</span><span class="o">.</span><span class="n">static_format</span><span class="p">(</span>
                 <span class="o">*</span><span class="n">args</span><span class="p">,</span>
                 <span class="n">model_name</span><span class="o">=</span><span class="n">model_name</span><span class="p">,</span>
             <span class="p">)</span>
 
         <span class="c1"># Gemini</span>
-        <span class="k">elif</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gemini&quot;</span><span class="p">):</span>
+        <span class="k">elif</span> <span class="n">model_name</span> <span class="ow">and</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gemini&quot;</span><span class="p">):</span>
             <span class="k">return</span> <span class="n">GeminiChatWrapper</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">)</span>
 
         <span class="c1"># Include DashScope, ZhipuAI, Ollama, the other models supported by</span>

diff --git a/en/_modules/agentscope/utils/tools.html b/en/_modules/agentscope/utils/tools.html
@@ -449,45 +449,6 @@ <h1>Source code for agentscope.utils.tools</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="nb">str</span><span class="p">(</span><span class="n">content</span><span class="p">)</span>
 
 
-<div class="viewcode-block" id="reform_dialogue">
-<a class="viewcode-back" href="../../../agentscope.utils.tools.html#agentscope.utils.tools.reform_dialogue">[docs]</a>
-<span class="k">def</span> <span class="nf">reform_dialogue</span><span class="p">(</span><span class="n">input_msgs</span><span class="p">:</span> <span class="nb">list</span><span class="p">[</span><span class="nb">dict</span><span class="p">])</span> <span class="o">-&gt;</span> <span class="nb">list</span><span class="p">[</span><span class="nb">dict</span><span class="p">]:</span>
-<span class="w">    </span><span class="sd">&quot;&quot;&quot;record dialog history as a list of strings&quot;&quot;&quot;</span>
-    <span class="n">messages</span> <span class="o">=</span> <span class="p">[]</span>
-
-    <span class="n">dialogue</span> <span class="o">=</span> <span class="p">[]</span>
-    <span class="k">for</span> <span class="n">i</span><span class="p">,</span> <span class="n">unit</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">input_msgs</span><span class="p">):</span>
-        <span class="k">if</span> <span class="n">i</span> <span class="o">==</span> <span class="mi">0</span> <span class="ow">and</span> <span class="n">unit</span><span class="p">[</span><span class="s2">&quot;role&quot;</span><span class="p">]</span> <span class="o">==</span> <span class="s2">&quot;system&quot;</span><span class="p">:</span>
-            <span class="c1"># system prompt</span>
-            <span class="n">messages</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
-                <span class="p">{</span>
-                    <span class="s2">&quot;role&quot;</span><span class="p">:</span> <span class="n">unit</span><span class="p">[</span><span class="s2">&quot;role&quot;</span><span class="p">],</span>
-                    <span class="s2">&quot;content&quot;</span><span class="p">:</span> <span class="n">_convert_to_str</span><span class="p">(</span><span class="n">unit</span><span class="p">[</span><span class="s2">&quot;content&quot;</span><span class="p">]),</span>
-                <span class="p">},</span>
-            <span class="p">)</span>
-        <span class="k">else</span><span class="p">:</span>
-            <span class="c1"># Merge all messages into a conversation history prompt</span>
-            <span class="n">dialogue</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
-                <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">unit</span><span class="p">[</span><span class="s1">&#39;name&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">_convert_to_str</span><span class="p">(</span><span class="n">unit</span><span class="p">[</span><span class="s1">&#39;content&#39;</span><span class="p">])</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">,</span>
-            <span class="p">)</span>
-
-    <span class="n">dialogue_history</span> <span class="o">=</span> <span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dialogue</span><span class="p">)</span>
-
-    <span class="n">user_content_template</span> <span class="o">=</span> <span class="s2">&quot;## Conversation History</span><span class="se">\n</span><span class="si">{dialogue_history}</span><span class="s2">&quot;</span>
-
-    <span class="n">messages</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
-        <span class="p">{</span>
-            <span class="s2">&quot;role&quot;</span><span class="p">:</span> <span class="s2">&quot;user&quot;</span><span class="p">,</span>
-            <span class="s2">&quot;content&quot;</span><span class="p">:</span> <span class="n">user_content_template</span><span class="o">.</span><span class="n">format</span><span class="p">(</span>
-                <span class="n">dialogue_history</span><span class="o">=</span><span class="n">dialogue_history</span><span class="p">,</span>
-            <span class="p">),</span>
-        <span class="p">},</span>
-    <span class="p">)</span>
-
-    <span class="k">return</span> <span class="n">messages</span></div>
-
-
-
 <span class="k">def</span> <span class="nf">_join_str_with_comma_and</span><span class="p">(</span><span class="n">elements</span><span class="p">:</span> <span class="n">List</span><span class="p">[</span><span class="nb">str</span><span class="p">])</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Return the JSON string with comma, and use &quot; and &quot; between the last two</span>
 <span class="sd">    elements.&quot;&quot;&quot;</span>

diff --git a/en/agentscope.html b/en/agentscope.html
@@ -1081,7 +1081,6 @@ <h2>Subpackages<a class="headerlink" href="#subpackages" title="Link to this hea
 <li class="toctree-l4"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.check_port"><code class="docutils literal notranslate"><span class="pre">check_port()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.generate_id_from_seed"><code class="docutils literal notranslate"><span class="pre">generate_id_from_seed()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.is_web_accessible"><code class="docutils literal notranslate"><span class="pre">is_web_accessible()</span></code></a></li>
-<li class="toctree-l4"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.reform_dialogue"><code class="docutils literal notranslate"><span class="pre">reform_dialogue()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.ImportErrorReporter"><code class="docutils literal notranslate"><span class="pre">ImportErrorReporter</span></code></a></li>
 </ul>
 </li>

diff --git a/en/agentscope.utils.html b/en/agentscope.utils.html
@@ -146,7 +146,6 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Link to this headi
 <li class="toctree-l2"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.check_port"><code class="docutils literal notranslate"><span class="pre">check_port()</span></code></a></li>
 <li class="toctree-l2"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.generate_id_from_seed"><code class="docutils literal notranslate"><span class="pre">generate_id_from_seed()</span></code></a></li>
 <li class="toctree-l2"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.is_web_accessible"><code class="docutils literal notranslate"><span class="pre">is_web_accessible()</span></code></a></li>
-<li class="toctree-l2"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.reform_dialogue"><code class="docutils literal notranslate"><span class="pre">reform_dialogue()</span></code></a></li>
 <li class="toctree-l2"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.ImportErrorReporter"><code class="docutils literal notranslate"><span class="pre">ImportErrorReporter</span></code></a><ul>
 <li class="toctree-l3"><a class="reference internal" href="agentscope.utils.tools.html#agentscope.utils.tools.ImportErrorReporter.__init__"><code class="docutils literal notranslate"><span class="pre">ImportErrorReporter.__init__()</span></code></a></li>
 </ul>

diff --git a/en/agentscope.utils.tools.html b/en/agentscope.utils.tools.html
@@ -190,12 +190,6 @@
 </div>
 </dd></dl>
 
-<dl class="py function">
-<dt class="sig sig-object py" id="agentscope.utils.tools.reform_dialogue">
-<span class="sig-prename descclassname"><span class="pre">agentscope.utils.tools.</span></span><span class="sig-name descname"><span class="pre">reform_dialogue</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">input_msgs</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">list</span><span class="p"><span class="pre">[</span></span><span class="pre">dict</span><span class="p"><span class="pre">]</span></span></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">list</span><span class="p"><span class="pre">[</span></span><span class="pre">dict</span><span class="p"><span class="pre">]</span></span></span></span><a class="reference internal" href="_modules/agentscope/utils/tools.html#reform_dialogue"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#agentscope.utils.tools.reform_dialogue" title="Link to this definition"></a></dt>
-<dd><p>record dialog history as a list of strings</p>
-</dd></dl>
-
 <dl class="py class">
 <dt class="sig sig-object py" id="agentscope.utils.tools.ImportErrorReporter">
 <em class="property"><span class="pre">class</span><span class="w"> </span></em><span class="sig-prename descclassname"><span class="pre">agentscope.utils.tools.</span></span><span class="sig-name descname"><span class="pre">ImportErrorReporter</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">error</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">ImportError</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">extras_require</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">str</span><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">None</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="_modules/agentscope/utils/tools.html#ImportErrorReporter"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#agentscope.utils.tools.ImportErrorReporter" title="Link to this definition"></a></dt>

diff --git a/en/genindex.html b/en/genindex.html
@@ -3188,8 +3188,6 @@ <h2 id="R">R</h2>
 </li>
       </ul></li>
       <li><a href="agentscope.web.workstation.workflow_node.html#agentscope.web.workstation.workflow_node.ReadTextServiceNode">ReadTextServiceNode (class in agentscope.web.workstation.workflow_node)</a>
-</li>
-      <li><a href="agentscope.utils.tools.html#agentscope.utils.tools.reform_dialogue">reform_dialogue() (in module agentscope.utils.tools)</a>
 </li>
       <li><a href="agentscope.rag.llama_index_knowledge.html#agentscope.rag.llama_index_knowledge.LlamaIndexKnowledge.refresh_index">refresh_index() (agentscope.rag.llama_index_knowledge.LlamaIndexKnowledge method)</a>
 
@@ -3257,14 +3255,14 @@ <h2 id="R">R</h2>
       </ul></li>
       <li><a href="agentscope.exception.html#agentscope.exception.RequiredFieldNotFoundError">RequiredFieldNotFoundError</a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="agentscope.agents.agent.html#agentscope.agents.agent.AgentBase.reset_audience">reset_audience() (agentscope.agents.agent.AgentBase method)</a>
 
       <ul>
         <li><a href="agentscope.agents.html#agentscope.agents.AgentBase.reset_audience">(agentscope.agents.AgentBase method)</a>
 </li>
       </ul></li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="agentscope.web.gradio.studio.html#agentscope.web.gradio.studio.reset_glb_var">reset_glb_var() (in module agentscope.web.gradio.studio)</a>
 </li>
       <li><a href="agentscope.service.execute_code.exec_notebook.html#agentscope.service.execute_code.exec_notebook.NoteBookExecutor.reset_notebook">reset_notebook() (agentscope.service.execute_code.exec_notebook.NoteBookExecutor method)</a>

diff --git a/en/objects.inv b/en/objects.inv
diff --git a/en/searchindex.js b/en/searchindex.js
diff --git a/zh_CN/.doctrees/agentscope.utils.tools.doctree b/zh_CN/.doctrees/agentscope.utils.tools.doctree
diff --git a/zh_CN/.doctrees/environment.pickle b/zh_CN/.doctrees/environment.pickle
diff --git a/zh_CN/.doctrees/index.doctree b/zh_CN/.doctrees/index.doctree
diff --git a/zh_CN/_modules/agentscope/models/post_model.html b/zh_CN/_modules/agentscope/models/post_model.html
@@ -333,14 +333,14 @@ <h1>agentscope.models.post_model 源代码</h1><div class="highlight"><pre>
         <span class="p">)</span>
 
         <span class="c1"># OpenAI</span>
-        <span class="k">if</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gpt-&quot;</span><span class="p">):</span>
+        <span class="k">if</span> <span class="n">model_name</span> <span class="ow">and</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gpt-&quot;</span><span class="p">):</span>
             <span class="k">return</span> <span class="n">OpenAIChatWrapper</span><span class="o">.</span><span class="n">static_format</span><span class="p">(</span>
                 <span class="o">*</span><span class="n">args</span><span class="p">,</span>
                 <span class="n">model_name</span><span class="o">=</span><span class="n">model_name</span><span class="p">,</span>
             <span class="p">)</span>
 
         <span class="c1"># Gemini</span>
-        <span class="k">elif</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gemini&quot;</span><span class="p">):</span>
+        <span class="k">elif</span> <span class="n">model_name</span> <span class="ow">and</span> <span class="n">model_name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;gemini&quot;</span><span class="p">):</span>
             <span class="k">return</span> <span class="n">GeminiChatWrapper</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">)</span>
 
         <span class="c1"># Include DashScope, ZhipuAI, Ollama, the other models supported by</span>