Skip to content

Commit

Permalink
deploy: bfaf9ed
Browse files Browse the repository at this point in the history
  • Loading branch information
@DavdGao
DavdGao committed Sep 6, 2024
1 parent 5d8fa29 commit 64bb2d9
Show file tree
Hide file tree
Showing 80 changed files with 293 additions and 403 deletions.
Binary file modified en/.doctrees/agentscope.agents.agent.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.agents.dialog_agent.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.agents.dict_dialog_agent.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.agents.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.agents.rag_agent.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.agents.react_agent.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.agents.rpc_agent.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.agents.user_agent.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.message.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.message.placeholder.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.msghub.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/agentscope.service.execute_code.exec_notebook.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified en/.doctrees/index.doctree
View file
Binary file not shown.
Binary file modified en/.doctrees/tutorial/102-installation.doctree
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions en/_modules/agentscope/agents/rpc_agent.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ <h1>Source code for agentscope.agents.rpc_agent</h1><div class="highlight"><pre>


<div class="viewcode-block" id="RpcAgent">
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.RpcAgent">[docs]</a>
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.rpc_agent.RpcAgent">[docs]</a>
<span class="k">class</span> <span class="nc">RpcAgent</span><span class="p">(</span><span class="n">AgentBase</span><span class="p">):</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;A wrapper to extend an AgentBase into a gRPC Client.&quot;&quot;&quot;</span>

<div class="viewcode-block" id="RpcAgent.__init__">
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.RpcAgent.__init__">[docs]</a>
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.rpc_agent.RpcAgent.__init__">[docs]</a>
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span>
<span class="bp">self</span><span class="p">,</span>
<span class="n">name</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span>
Expand Down Expand Up @@ -239,7 +239,7 @@ <h1>Source code for agentscope.agents.rpc_agent</h1><div class="highlight"><pre>
<span class="bp">self</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">create_agent</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">agent_configs</span><span class="p">)</span>

<div class="viewcode-block" id="RpcAgent.reply">
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.RpcAgent.reply">[docs]</a>
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.rpc_agent.RpcAgent.reply">[docs]</a>
<span class="k">def</span> <span class="nf">reply</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">x</span><span class="p">:</span> <span class="n">Optional</span><span class="p">[</span><span class="n">Union</span><span class="p">[</span><span class="n">Msg</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">[</span><span class="n">Msg</span><span class="p">]]]</span> <span class="o">=</span> <span class="kc">None</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Msg</span><span class="p">:</span>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">client</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">_launch_server</span><span class="p">()</span>
Expand All @@ -250,7 +250,7 @@ <h1>Source code for agentscope.agents.rpc_agent</h1><div class="highlight"><pre>


<div class="viewcode-block" id="RpcAgent.observe">
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.RpcAgent.observe">[docs]</a>
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.rpc_agent.RpcAgent.observe">[docs]</a>
<span class="k">def</span> <span class="nf">observe</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">x</span><span class="p">:</span> <span class="n">Union</span><span class="p">[</span><span class="n">Msg</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">[</span><span class="n">Msg</span><span class="p">]])</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">client</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">_launch_server</span><span class="p">()</span>
Expand All @@ -261,7 +261,7 @@ <h1>Source code for agentscope.agents.rpc_agent</h1><div class="highlight"><pre>


<div class="viewcode-block" id="RpcAgent.clone_instances">
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.RpcAgent.clone_instances">[docs]</a>
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.rpc_agent.RpcAgent.clone_instances">[docs]</a>
<span class="k">def</span> <span class="nf">clone_instances</span><span class="p">(</span>
<span class="bp">self</span><span class="p">,</span>
<span class="n">num_instances</span><span class="p">:</span> <span class="nb">int</span><span class="p">,</span>
Expand Down Expand Up @@ -309,7 +309,7 @@ <h1>Source code for agentscope.agents.rpc_agent</h1><div class="highlight"><pre>


<div class="viewcode-block" id="RpcAgent.stop">
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.RpcAgent.stop">[docs]</a>
<a class="viewcode-back" href="../../../agentscope.agents.rpc_agent.html#agentscope.agents.rpc_agent.RpcAgent.stop">[docs]</a>
<span class="k">def</span> <span class="nf">stop</span><span class="p">(</span><span class="bp">self</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;Stop the RpcAgent and the rpc server.&quot;&quot;&quot;</span>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">server_launcher</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
Expand Down
8 changes: 5 additions & 3 deletions en/_modules/agentscope/models/dashscope_model.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ <h1>Source code for agentscope.models.dashscope_model</h1><div class="highlight"
<span class="kn">from</span> <span class="nn">http</span> <span class="kn">import</span> <span class="n">HTTPStatus</span>
<span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Union</span><span class="p">,</span> <span class="n">List</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">,</span> <span class="n">Optional</span><span class="p">,</span> <span class="n">Generator</span>

<span class="kn">from</span> <span class="nn">dashscope.api_entities.dashscope_response</span> <span class="kn">import</span> <span class="n">GenerationResponse</span>
<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">..manager</span> <span class="kn">import</span> <span class="n">FileManager</span>
Expand All @@ -131,8 +130,10 @@ <h1>Source code for agentscope.models.dashscope_model</h1><div class="highlight"

<span class="k">try</span><span class="p">:</span>
<span class="kn">import</span> <span class="nn">dashscope</span>
<span class="kn">from</span> <span class="nn">dashscope.api_entities.dashscope_response</span> <span class="kn">import</span> <span class="n">GenerationResponse</span>
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
<span class="n">dashscope</span> <span class="o">=</span> <span class="kc">None</span>
<span class="n">GenerationResponse</span> <span class="o">=</span> <span class="kc">None</span>

<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>

Expand Down Expand Up @@ -173,7 +174,8 @@ <h1>Source code for agentscope.models.dashscope_model</h1><div class="highlight"

<span class="k">if</span> <span class="n">dashscope</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">ImportError</span><span class="p">(</span>
<span class="s2">&quot;Cannot find dashscope package in current python environment.&quot;</span><span class="p">,</span>
<span class="s2">&quot;The package &#39;dashscope&#39; is not installed. Please install it &quot;</span>
<span class="s2">&quot;by running `pip install dashscope==1.14.1`&quot;</span><span class="p">,</span>
<span class="p">)</span>

<span class="bp">self</span><span class="o">.</span><span class="n">generate_args</span> <span class="o">=</span> <span class="n">generate_args</span> <span class="ow">or</span> <span class="p">{}</span>
Expand Down Expand Up @@ -868,7 +870,7 @@ <h1>Source code for agentscope.models.dashscope_model</h1><div class="highlight"
<span class="n">messages</span><span class="o">=</span><span class="n">messages</span><span class="p">,</span>
<span class="o">**</span><span class="n">kwargs</span><span class="p">,</span>
<span class="p">)</span>
<span class="c1"># Unhandle code path here</span>
<span class="c1"># Unhandled code path here</span>
<span class="c1"># response could be a generator , if stream is yes</span>
<span class="c1"># suggest add a check here</span>
<span class="k">if</span> <span class="n">response</span><span class="o">.</span><span class="n">status_code</span> <span class="o">!=</span> <span class="n">HTTPStatus</span><span class="o">.</span><span class="n">OK</span><span class="p">:</span>
Expand Down
14 changes: 9 additions & 5 deletions en/_modules/agentscope/models/ollama_model.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,6 @@ <h1>Source code for agentscope.models.ollama_model</h1><div class="highlight"><p
<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>
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
<span class="n">ollama</span> <span class="o">=</span> <span class="kc">None</span>


<div class="viewcode-block" id="OllamaWrapperBase">
<a class="viewcode-back" href="../../../agentscope.models.ollama_model.html#agentscope.models.OllamaWrapperBase">[docs]</a>
Expand Down Expand Up @@ -188,6 +183,15 @@ <h1>Source code for agentscope.models.ollama_model</h1><div class="highlight"><p

<span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="o">=</span> <span class="n">options</span>
<span class="bp">self</span><span class="o">.</span><span class="n">keep_alive</span> <span class="o">=</span> <span class="n">keep_alive</span>

<span class="k">try</span><span class="p">:</span>
<span class="kn">import</span> <span class="nn">ollama</span>
<span class="k">except</span> <span class="ne">ImportError</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">ImportError</span><span class="p">(</span>
<span class="s2">&quot;The package ollama is not found. Please install it by &quot;</span>
<span class="s1">&#39;running command `pip install &quot;ollama&gt;=0.1.7&quot;`&#39;</span><span class="p">,</span>
<span class="p">)</span> <span class="kn">from</span> <span class="nn">e</span>

<span class="bp">self</span><span class="o">.</span><span class="n">client</span> <span class="o">=</span> <span class="n">ollama</span><span class="o">.</span><span class="n">Client</span><span class="p">(</span><span class="n">host</span><span class="o">=</span><span class="n">host</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span></div>
</div>

Expand Down
Loading

0 comments on commit 64bb2d9

Please sign in to comment.