deploy: e4be96f

Author: Epse

_modules/obelisk/asynchronous/client.html

@@ -38,7 +38,7 @@ <h1>Source code for obelisk.asynchronous.client</h1><div class="highlight"><pre>
 
 <span class="kn">import</span><span class="w"> </span><span class="nn">httpx</span>
 
-<span class="kn">from</span><span class="w"> </span><span class="nn">obelisk.exceptions</span><span class="w"> </span><span class="kn">import</span> <span class="n">AuthenticationError</span>
+<span class="kn">from</span><span class="w"> </span><span class="nn">obelisk.exceptions</span><span class="w"> </span><span class="kn">import</span> <span class="n">AuthenticationError</span><span class="p">,</span> <span class="n">ObeliskError</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">obelisk.strategies.retry</span><span class="w"> </span><span class="kn">import</span> <span class="n">RetryStrategy</span><span class="p">,</span> \
     <span class="n">NoRetryStrategy</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">obelisk.types</span><span class="w"> </span><span class="kn">import</span> <span class="n">ObeliskKind</span>
@@ -114,9 +114,10 @@ <h1>Source code for obelisk.asynchronous.client</h1><div class="highlight"><pre>
 
         <span class="k">async</span> <span class="k">with</span> <span class="n">httpx</span><span class="o">.</span><span class="n">AsyncClient</span><span class="p">()</span> <span class="k">as</span> <span class="n">client</span><span class="p">:</span>
             <span class="n">response</span> <span class="o">=</span> <span class="kc">None</span>
+            <span class="n">request</span> <span class="o">=</span> <span class="kc">None</span>
             <span class="n">last_error</span> <span class="o">=</span> <span class="kc">None</span>
             <span class="n">retry</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">retry_strategy</span><span class="o">.</span><span class="n">make</span><span class="p">()</span>
-            <span class="k">while</span> <span class="ow">not</span> <span class="n">response</span> <span class="ow">or</span> <span class="k">await</span> <span class="n">retry</span><span class="o">.</span><span class="n">should_retry</span><span class="p">():</span>
+            <span class="k">while</span> <span class="ow">not</span> <span class="n">response</span><span class="p">:</span>
                 <span class="k">try</span><span class="p">:</span>
                     <span class="n">request</span> <span class="o">=</span> <span class="k">await</span> <span class="n">client</span><span class="o">.</span><span class="n">post</span><span class="p">(</span>
                         <span class="bp">self</span><span class="o">.</span><span class="n">_token_url</span><span class="p">,</span>
@@ -128,10 +129,13 @@ <h1>Source code for obelisk.asynchronous.client</h1><div class="highlight"><pre>
                 <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
                     <span class="n">last_error</span> <span class="o">=</span> <span class="n">e</span>
                     <span class="bp">self</span><span class="o">.</span><span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="n">e</span><span class="p">)</span>
-                    <span class="k">continue</span>
+                    <span class="k">if</span> <span class="k">await</span> <span class="n">retry</span><span class="o">.</span><span class="n">should_retry</span><span class="p">():</span>
+                        <span class="k">continue</span>
+                    <span class="k">else</span><span class="p">:</span>
+                        <span class="k">break</span>
 
-            <span class="k">if</span> <span class="n">response</span> <span class="ow">is</span> <span class="kc">None</span> <span class="ow">and</span> <span class="n">last_error</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-                <span class="k">raise</span> <span class="n">last_error</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="n">response</span> <span class="ow">or</span> <span class="ow">not</span> <span class="n">request</span><span class="p">:</span>
+                <span class="k">raise</span> <span class="p">(</span><span class="n">last_error</span> <span class="k">if</span> <span class="n">last_error</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span> <span class="k">else</span> <span class="n">ObeliskError</span><span class="p">(</span><span class="s2">&quot;No response&quot;</span><span class="p">))</span>
 
             <span class="k">if</span> <span class="n">request</span><span class="o">.</span><span class="n">status_code</span> <span class="o">!=</span> <span class="mi">200</span><span class="p">:</span>
                 <span class="k">if</span> <span class="s1">&#39;error&#39;</span> <span class="ow">in</span> <span class="n">response</span><span class="p">:</span>
@@ -182,7 +186,7 @@ <h1>Source code for obelisk.asynchronous.client</h1><div class="highlight"><pre>
             <span class="n">response</span> <span class="o">=</span> <span class="kc">None</span>
             <span class="n">retry</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">retry_strategy</span><span class="o">.</span><span class="n">make</span><span class="p">()</span>
             <span class="n">last_error</span> <span class="o">=</span> <span class="kc">None</span>
-            <span class="k">while</span> <span class="ow">not</span> <span class="n">response</span> <span class="ow">or</span> <span class="k">await</span> <span class="n">retry</span><span class="o">.</span><span class="n">should_retry</span><span class="p">():</span>
+            <span class="k">while</span> <span class="ow">not</span> <span class="n">response</span><span class="p">:</span>
                 <span class="k">if</span> <span class="n">response</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
                     <span class="bp">self</span><span class="o">.</span><span class="n">log</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Retrying, last response: </span><span class="si">{</span><span class="n">response</span><span class="o">.</span><span class="n">status_code</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
 
@@ -198,7 +202,10 @@ <h1>Source code for obelisk.asynchronous.client</h1><div class="highlight"><pre>
                 <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
                     <span class="bp">self</span><span class="o">.</span><span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="n">e</span><span class="p">)</span>
                     <span class="n">last_error</span> <span class="o">=</span> <span class="n">e</span>
-                    <span class="k">continue</span>
+                    <span class="k">if</span> <span class="k">await</span> <span class="n">retry</span><span class="o">.</span><span class="n">should_retry</span><span class="p">():</span>
+                        <span class="k">continue</span>
+                    <span class="k">else</span><span class="p">:</span>
+                        <span class="k">break</span>
 
             <span class="k">if</span> <span class="ow">not</span> <span class="n">response</span> <span class="ow">and</span> <span class="n">last_error</span><span class="p">:</span>
                 <span class="k">raise</span> <span class="n">last_error</span>

_modules/obelisk/asynchronous/consumer_test.html

@@ -36,11 +36,14 @@ <h1>Source code for obelisk.asynchronous.consumer_test</h1><div class="highlight
 
 <span class="n">pytest_plugins</span> <span class="o">=</span> <span class="p">(</span><span class="s1">&#39;pytest_asyncio&#39;</span><span class="p">,)</span>
 
+<span class="n">client_id</span> <span class="o">=</span> <span class="s2">&quot;682c6c46604b3b3be35429df&quot;</span>
+<span class="n">client_secret</span> <span class="o">=</span> <span class="s2">&quot;7136832d-01be-456a-a1fe-25c7f9e130c5&quot;</span>
+
 <div class="viewcode-block" id="test_demo_igent">
 <a class="viewcode-back" href="../../../_autosummary/obelisk.asynchronous.consumer_test.test_demo_igent.html#obelisk.asynchronous.consumer_test.test_demo_igent">[docs]</a>
 <span class="nd">@pytest</span><span class="o">.</span><span class="n">mark</span><span class="o">.</span><span class="n">asyncio</span>
 <span class="k">async</span> <span class="k">def</span><span class="w"> </span><span class="nf">test_demo_igent</span><span class="p">():</span>
-    <span class="n">consumer</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="s2">&quot;67c716e616c11421cfe2faf6&quot;</span><span class="p">,</span> <span class="n">secret</span><span class="o">=</span><span class="s2">&quot;08dafe89-0389-45b4-9832-cc565fb8c2eb&quot;</span><span class="p">)</span>
+    <span class="n">consumer</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="n">client_id</span><span class="p">,</span> <span class="n">secret</span><span class="o">=</span><span class="n">client_secret</span><span class="p">)</span>
     <span class="n">result</span> <span class="o">=</span> <span class="k">await</span> <span class="n">consumer</span><span class="o">.</span><span class="n">single_chunk</span><span class="p">(</span>
         <span class="n">datasets</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;612f6c39cbceda0ea9753d95&quot;</span><span class="p">],</span>
         <span class="n">metrics</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;org.dyamand.types.common.Temperature::number&quot;</span><span class="p">],</span>

_modules/obelisk/sync/consumer_test.html

@@ -33,10 +33,13 @@
   <h1>Source code for obelisk.sync.consumer_test</h1><div class="highlight"><pre>
 <span></span><span class="kn">from</span><span class="w"> </span><span class="nn">.consumer</span><span class="w"> </span><span class="kn">import</span> <span class="n">Consumer</span>
 
+<span class="n">client_id</span> <span class="o">=</span> <span class="s2">&quot;682c6c46604b3b3be35429df&quot;</span>
+<span class="n">client_secret</span> <span class="o">=</span> <span class="s2">&quot;7136832d-01be-456a-a1fe-25c7f9e130c5&quot;</span>
+
 <div class="viewcode-block" id="test_demo_igent">
 <a class="viewcode-back" href="../../../_autosummary/obelisk.sync.consumer_test.test_demo_igent.html#obelisk.sync.consumer_test.test_demo_igent">[docs]</a>
 <span class="k">def</span><span class="w"> </span><span class="nf">test_demo_igent</span><span class="p">():</span>
-    <span class="n">consumer</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="s2">&quot;67c716e616c11421cfe2faf6&quot;</span><span class="p">,</span> <span class="n">secret</span><span class="o">=</span><span class="s2">&quot;08dafe89-0389-45b4-9832-cc565fb8c2eb&quot;</span><span class="p">)</span>
+    <span class="n">consumer</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="n">client_id</span><span class="p">,</span><span class="n">secret</span><span class="o">=</span><span class="n">client_secret</span><span class="p">)</span>
     <span class="n">result</span> <span class="o">=</span> <span class="n">consumer</span><span class="o">.</span><span class="n">single_chunk</span><span class="p">(</span>
         <span class="n">datasets</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;612f6c39cbceda0ea9753d95&quot;</span><span class="p">],</span>
         <span class="n">metrics</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;org.dyamand.types.common.Temperature::number&quot;</span><span class="p">],</span>
@@ -51,16 +54,16 @@ <h1>Source code for obelisk.sync.consumer_test</h1><div class="highlight"><pre>
 <div class="viewcode-block" id="test_two_instances">
 <a class="viewcode-back" href="../../../_autosummary/obelisk.sync.consumer_test.test_two_instances.html#obelisk.sync.consumer_test.test_two_instances">[docs]</a>
 <span class="k">def</span><span class="w"> </span><span class="nf">test_two_instances</span><span class="p">():</span>
-    <span class="n">consumer_one</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="s2">&quot;67c716e616c11421cfe2faf6&quot;</span><span class="p">,</span> <span class="n">secret</span><span class="o">=</span><span class="s2">&quot;08dafe89-0389-45b4-9832-cc565fb8c2eb&quot;</span><span class="p">)</span>
-    <span class="n">consumer_two</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="s2">&quot;67c716e616c11421cfe2faf6&quot;</span><span class="p">,</span> <span class="n">secret</span><span class="o">=</span><span class="s2">&quot;08dafe89-0389-45b4-9832-cc565fb8c2eb&quot;</span><span class="p">)</span>
+    <span class="n">consumer_one</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="n">client_id</span><span class="p">,</span><span class="n">secret</span><span class="o">=</span><span class="n">client_secret</span><span class="p">)</span>
+    <span class="n">consumer_two</span> <span class="o">=</span> <span class="n">Consumer</span><span class="p">(</span><span class="n">client</span><span class="o">=</span><span class="n">client_id</span><span class="p">,</span><span class="n">secret</span><span class="o">=</span><span class="n">client_secret</span><span class="p">)</span>
     <span class="n">result_one</span> <span class="o">=</span> <span class="n">consumer_one</span><span class="o">.</span><span class="n">single_chunk</span><span class="p">(</span>
         <span class="n">datasets</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;612f6c39cbceda0ea9753d95&quot;</span><span class="p">],</span>
         <span class="n">metrics</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;org.dyamand.types.common.Temperature::number&quot;</span><span class="p">],</span>
         <span class="n">from_timestamp</span><span class="o">=</span><span class="mi">1740924034000</span><span class="p">,</span>
         <span class="n">to_timestamp</span><span class="o">=</span><span class="mi">1741100614258</span><span class="p">,</span>
         <span class="n">limit</span><span class="o">=</span><span class="mi">2</span>
     <span class="p">)</span>
-    <span class="n">result_two</span> <span class="o">=</span> <span class="n">consumer_one</span><span class="o">.</span><span class="n">single_chunk</span><span class="p">(</span>
+    <span class="n">result_two</span> <span class="o">=</span> <span class="n">consumer_two</span><span class="o">.</span><span class="n">single_chunk</span><span class="p">(</span>
         <span class="n">datasets</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;612f6c39cbceda0ea9753d95&quot;</span><span class="p">],</span>
         <span class="n">metrics</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;org.dyamand.types.common.Temperature::number&quot;</span><span class="p">],</span>
         <span class="n">from_timestamp</span><span class="o">=</span><span class="mi">1740924034000</span><span class="p">,</span>