Skip to content

Commit

Permalink
deploy: aaf672c
Browse files Browse the repository at this point in the history
  • Loading branch information
pan-x-c committed May 14, 2024
1 parent b7af68e commit 85e40b0
Show file tree
Hide file tree
Showing 24 changed files with 186 additions and 42 deletions.
Binary file modified en/.doctrees/agentscope.utils.tools.doctree
Binary file not shown.
Binary file modified en/.doctrees/environment.pickle
Binary file not shown.
Binary file modified en/.doctrees/index.doctree
Binary file not shown.
14 changes: 8 additions & 6 deletions en/_modules/agentscope/agents/rpc_agent.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h1>Source code for agentscope.agents.rpc_agent</h1><div class="highlight"><pre>
<span class="kn">import</span> <span class="nn">base64</span>
<span class="kn">import</span> <span class="nn">traceback</span>
<span class="kn">import</span> <span class="nn">asyncio</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">Type</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">Sequence</span>
<span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">Type</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">Sequence</span>
<span class="kn">from</span> <span class="nn">concurrent</span> <span class="kn">import</span> <span class="n">futures</span>
<span class="kn">from</span> <span class="nn">loguru</span> <span class="kn">import</span> <span class="n">logger</span>

Expand All @@ -117,11 +117,13 @@ <h1>Source code for agentscope.agents.rpc_agent</h1><div class="highlight"><pre>
<span class="kn">import</span> <span class="nn">grpc</span>
<span class="kn">from</span> <span class="nn">grpc</span> <span class="kn">import</span> <span class="n">ServicerContext</span>
<span class="kn">from</span> <span class="nn">expiringdict</span> <span class="kn">import</span> <span class="n">ExpiringDict</span>
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
<span class="n">dill</span> <span class="o">=</span> <span class="kc">None</span>
<span class="n">grpc</span> <span class="o">=</span> <span class="kc">None</span>
<span class="n">ServicerContext</span> <span class="o">=</span> <span class="n">Any</span>
<span class="n">ExpiringDict</span> <span class="o">=</span> <span class="kc">None</span>
<span class="k">except</span> <span class="ne">ImportError</span> <span class="k">as</span> <span class="n">import_error</span><span class="p">:</span>
<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">ImportErrorReporter</span>

<span class="n">dill</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>
<span class="n">grpc</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>
<span class="n">ServicerContext</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>
<span class="n">ExpiringDict</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>

<span class="kn">from</span> <span class="nn">agentscope._init</span> <span class="kn">import</span> <span class="n">init_process</span><span class="p">,</span> <span class="n">_INIT_SETTINGS</span>
<span class="kn">from</span> <span class="nn">agentscope.agents.agent</span> <span class="kn">import</span> <span class="n">AgentBase</span>
Expand Down
2 changes: 1 addition & 1 deletion en/_modules/agentscope/models/dashscope_model.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ <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="k">except</span> <span class="ne">ModuleNotFoundError</span><span class="p">:</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="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
19 changes: 9 additions & 10 deletions en/_modules/agentscope/rpc/rpc_agent_client.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,23 @@ <h1>Source code for agentscope.rpc.rpc_agent_client</h1><div class="highlight"><

<span class="kn">import</span> <span class="nn">threading</span>
<span class="kn">import</span> <span class="nn">base64</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">Optional</span>
<span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">Optional</span>
<span class="kn">from</span> <span class="nn">loguru</span> <span class="kn">import</span> <span class="n">logger</span>

<span class="k">try</span><span class="p">:</span>
<span class="kn">import</span> <span class="nn">dill</span>
<span class="kn">import</span> <span class="nn">grpc</span>
<span class="kn">from</span> <span class="nn">grpc</span> <span class="kn">import</span> <span class="n">RpcError</span>
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
<span class="n">dill</span> <span class="o">=</span> <span class="kc">None</span>
<span class="n">grpc</span> <span class="o">=</span> <span class="kc">None</span>
<span class="n">RpcError</span> <span class="o">=</span> <span class="kc">None</span>

<span class="k">try</span><span class="p">:</span>
<span class="kn">from</span> <span class="nn">agentscope.rpc.rpc_agent_pb2</span> <span class="kn">import</span> <span class="n">RpcMsg</span> <span class="c1"># pylint: disable=E0611</span>
<span class="kn">from</span> <span class="nn">agentscope.rpc.rpc_agent_pb2_grpc</span> <span class="kn">import</span> <span class="n">RpcAgentStub</span>
<span class="k">except</span> <span class="ne">ModuleNotFoundError</span><span class="p">:</span>
<span class="n">RpcMsg</span> <span class="o">=</span> <span class="n">Any</span> <span class="c1"># type: ignore[misc]</span>
<span class="n">RpcAgentStub</span> <span class="o">=</span> <span class="n">Any</span>
<span class="k">except</span> <span class="ne">ImportError</span> <span class="k">as</span> <span class="n">import_error</span><span class="p">:</span>
<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">ImportErrorReporter</span>

<span class="n">dill</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>
<span class="n">grpc</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>
<span class="n">RpcMsg</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>
<span class="n">RpcAgentStub</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>
<span class="n">RpcError</span> <span class="o">=</span> <span class="ne">ImportError</span>


<div class="viewcode-block" id="RpcAgentClient">
Expand Down
6 changes: 4 additions & 2 deletions en/_modules/agentscope/rpc/rpc_agent_pb2_grpc.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ <h1>Source code for agentscope.rpc.rpc_agent_pb2_grpc</h1><div class="highlight"
<span class="sd">&quot;&quot;&quot;Client and server classes corresponding to protobuf-defined services.&quot;&quot;&quot;</span>
<span class="k">try</span><span class="p">:</span>
<span class="kn">import</span> <span class="nn">grpc</span>
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
<span class="n">grpc</span> <span class="o">=</span> <span class="kc">None</span>
<span class="k">except</span> <span class="ne">ImportError</span> <span class="k">as</span> <span class="n">import_error</span><span class="p">:</span>
<span class="kn">from</span> <span class="nn">agentscope.utils.tools</span> <span class="kn">import</span> <span class="n">ImportErrorReporter</span>

<span class="n">grpc</span> <span class="o">=</span> <span class="n">ImportErrorReporter</span><span class="p">(</span><span class="n">import_error</span><span class="p">,</span> <span class="s2">&quot;distribute&quot;</span><span class="p">)</span>

<span class="kn">import</span> <span class="nn">agentscope.rpc.rpc_agent_pb2</span> <span class="k">as</span> <span class="nn">rpc__agent__pb2</span>

Expand Down
42 changes: 42 additions & 0 deletions en/_modules/agentscope/utils/tools.html
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,48 @@ <h1>Source code for agentscope.utils.tools</h1><div class="highlight"><pre>
<span class="k">return</span> <span class="s2">&quot; and &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">elements</span><span class="p">)</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">return</span> <span class="s2">&quot;, &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">elements</span><span class="p">[:</span><span class="o">-</span><span class="mi">1</span><span class="p">])</span> <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;, and </span><span class="si">{</span><span class="n">elements</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span>


<div class="viewcode-block" id="ImportErrorReporter">
<a class="viewcode-back" href="../../../agentscope.utils.tools.html#agentscope.utils.tools.ImportErrorReporter">[docs]</a>
<span class="k">class</span> <span class="nc">ImportErrorReporter</span><span class="p">:</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;Used as a placeholder for missing packages.</span>
<span class="sd"> When called, an ImportError will be raised, prompting the user to install</span>
<span class="sd"> the specified extras requirement.</span>
<span class="sd"> &quot;&quot;&quot;</span>

<div class="viewcode-block" id="ImportErrorReporter.__init__">
<a class="viewcode-back" href="../../../agentscope.utils.tools.html#agentscope.utils.tools.ImportErrorReporter.__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">error</span><span class="p">:</span> <span class="ne">ImportError</span><span class="p">,</span> <span class="n">extras_require</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="kc">None</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;Init the ImportErrorReporter.</span>

<span class="sd"> Args:</span>
<span class="sd"> error (`ImportError`): the original ImportError.</span>
<span class="sd"> extras_require (`str`): the extras requirement.</span>
<span class="sd"> &quot;&quot;&quot;</span>
<span class="bp">self</span><span class="o">.</span><span class="n">error</span> <span class="o">=</span> <span class="n">error</span>
<span class="bp">self</span><span class="o">.</span><span class="n">extras_require</span> <span class="o">=</span> <span class="n">extras_require</span></div>


<span class="k">def</span> <span class="fm">__call__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">:</span> <span class="n">Any</span><span class="p">,</span> <span class="o">**</span><span class="n">kwds</span><span class="p">:</span> <span class="n">Any</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Any</span><span class="p">:</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_raise_import_error</span><span class="p">()</span>

<span class="k">def</span> <span class="fm">__getattr__</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> <span class="o">-&gt;</span> <span class="n">Any</span><span class="p">:</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_raise_import_error</span><span class="p">()</span>

<span class="k">def</span> <span class="fm">__getitem__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">__key</span><span class="p">:</span> <span class="n">Any</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Any</span><span class="p">:</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_raise_import_error</span><span class="p">()</span>

<span class="k">def</span> <span class="nf">_raise_import_error</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Any</span><span class="p">:</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;Raise the ImportError&quot;&quot;&quot;</span>
<span class="n">err_msg</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;ImportError occorred: [</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">error</span><span class="o">.</span><span class="n">msg</span><span class="si">}</span><span class="s2">].&quot;</span>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">extras_require</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">err_msg</span> <span class="o">+=</span> <span class="p">(</span>
<span class="sa">f</span><span class="s2">&quot; Please install [</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">extras_require</span><span class="si">}</span><span class="s2">] version&quot;</span>
<span class="s2">&quot; of agentscope.&quot;</span>
<span class="p">)</span>
<span class="k">raise</span> <span class="ne">ImportError</span><span class="p">(</span><span class="n">err_msg</span><span class="p">)</span></div>

</pre></div>

</div>
Expand Down
23 changes: 23 additions & 0 deletions en/agentscope.utils.tools.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,29 @@
<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>
<dd><p>Bases: <code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></p>
<p>Used as a placeholder for missing packages.
When called, an ImportError will be raised, prompting the user to install
the specified extras requirement.</p>
<dl class="py method">
<dt class="sig sig-object py" id="agentscope.utils.tools.ImportErrorReporter.__init__">
<span class="sig-name descname"><span class="pre">__init__</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> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">None</span></span></span><a class="reference internal" href="_modules/agentscope/utils/tools.html#ImportErrorReporter.__init__"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#agentscope.utils.tools.ImportErrorReporter.__init__" title="Link to this definition"></a></dt>
<dd><p>Init the ImportErrorReporter.</p>
<dl class="field-list simple">
<dt class="field-odd">Parameters<span class="colon">:</span></dt>
<dd class="field-odd"><ul class="simple">
<li><p><strong>error</strong> (<cite>ImportError</cite>) – the original ImportError.</p></li>
<li><p><strong>extras_require</strong> (<cite>str</cite>) – the extras requirement.</p></li>
</ul>
</dd>
</dl>
</dd></dl>

</dd></dl>

</section>


Expand Down
4 changes: 4 additions & 0 deletions en/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,8 @@ <h2 id="_">_</h2>
<li><a href="agentscope.utils.monitor.html#agentscope.utils.monitor.SqliteMonitor.__init__">(agentscope.utils.monitor.SqliteMonitor method)</a>
</li>
<li><a href="agentscope.utils.html#agentscope.utils.QuotaExceededError.__init__">(agentscope.utils.QuotaExceededError method)</a>
</li>
<li><a href="agentscope.utils.tools.html#agentscope.utils.tools.ImportErrorReporter.__init__">(agentscope.utils.tools.ImportErrorReporter method)</a>
</li>
<li><a href="agentscope.web.workstation.workflow_dag.html#agentscope.web.workstation.workflow_dag.ASDiGraph.__init__">(agentscope.web.workstation.workflow_dag.ASDiGraph method)</a>
</li>
Expand Down Expand Up @@ -1736,6 +1738,8 @@ <h2 id="I">I</h2>
</ul></td>
<td style="width: 33%; vertical-align: top;"><ul>
<li><a href="agentscope.web.studio.studio.html#agentscope.web.studio.studio.import_function_from_path">import_function_from_path() (in module agentscope.web.studio.studio)</a>
</li>
<li><a href="agentscope.utils.tools.html#agentscope.utils.tools.ImportErrorReporter">ImportErrorReporter (class in agentscope.utils.tools)</a>
</li>
<li><a href="agentscope.html#agentscope.init">init() (in module agentscope)</a>

Expand Down
Binary file modified en/objects.inv
Binary file not shown.
2 changes: 1 addition & 1 deletion en/searchindex.js

Large diffs are not rendered by default.

Binary file modified zh_CN/.doctrees/agentscope.utils.tools.doctree
Binary file not shown.
Binary file modified zh_CN/.doctrees/environment.pickle
Binary file not shown.
Binary file modified zh_CN/.doctrees/index.doctree
Binary file not shown.
Loading

0 comments on commit 85e40b0

Please sign in to comment.