deps

e-nikolov · Jan 23, 2024 · 024a71e · 024a71e
1 parent 662ffba
commit 024a71e
Show file tree

Hide file tree

Showing 6 changed files with 472 additions and 1,861 deletions.
diff --git a/mpyc-web-core/lib/runtimes/PyScriptWorker/PyScriptWorkerRuntime.ts b/mpyc-web-core/lib/runtimes/PyScriptWorker/PyScriptWorkerRuntime.ts
@@ -8,7 +8,7 @@ import { MPCRuntimeBase } from '../MPCRuntimeBase';
 
 function XXWorker(startupURL: string, configFilePath: string | any, hooks: any) {
     let opts: unknown = {
-        async: true, type: "pyodide", version: "0.24.1", config: configFilePath
+        async: true, type: "pyodide", version: "0.25.0", config: configFilePath
     }
 
     console.log("creating a new worker")

diff --git a/mpyc-web-core/package.json b/mpyc-web-core/package.json
@@ -30,7 +30,7 @@
   ],
   "devDependencies": {
     "dts-bundle-generator": "^9.0.0",
-    "pyodide": "^0.24.1",
+    "pyodide": "^0.25.0",
     "rollup": "^4.6.0",
     "tslib": "^2.6.2",
     "typescript": "^5.3.2",

diff --git a/mpyc-web-py/lib/stats.py b/mpyc-web-py/lib/stats.py
@@ -65,13 +65,9 @@
 
 def format_asyncio_stats(stats):
     return (
-        f't: {format_count(stats["tasks"])} / {format_count(stats["max_tasks"])} / {format_count(stats["total_tasks_count"])} \n'
-        f' | l: {format_count(stats["call_soon_count"])}'
-        f' / {format_count(stats["loop_inner_iters"])}'
-        f' / {format_count(stats["loop_iters"])}'
-        f' / {format_count(stats["loop_reiters"])} \n'
-        f' | q: {format_count(stats["ready"])} / {format_count(stats["ntodo"])}'
-        # f' | r: {format_count(stats["run_once_triggers"])} / {format_count(stats["skip_run_once_triggers"])}'
+        f"tasks: {format_count(stats['ntodo'])} / {format_count(stats['tasks'])} / {format_count(stats['max_tasks'])} /"
+        f" {format_count(stats['total_tasks_count'])} | loop: {format_count(stats['loop_iters'])} /"
+        f" {format_count(stats['loop_inner_iters'])} / {format_count(stats['call_soon_count'])}"
     )
 
 

diff --git a/mpyc-web-py/lib/weblooperV10.py b/mpyc-web-py/lib/weblooperV10.py
@@ -86,14 +86,13 @@ def trigger_run_once(self):
     def _run_once(self, *args, **kwargs):
         ntodo = len(self._ready)
         stats_set("ntodo", ntodo)
-        async_proxy.maybe_send_stats()
 
         for _ in range(ntodo):
             stats_add("loop_inner_iters")
             self._ready.popleft()()
 
         nleft = len(self._ready)
-        stats_set("ready", nleft)
+        async_proxy.maybe_send_stats()
         if nleft == 0:
             self.running = False
         else:

diff --git a/pyproject.toml b/pyproject.toml
@@ -45,7 +45,7 @@ packages = [
     # pyodide-pack = "^2.1.2"
     # pyodide-pack = "^0.2.0"
     # pyodide-pack = "^0.2.0"
-    pyodide-py = "^0.24.1"
+    pyodide-py = "^0.25.0"
     rich = "^13.5.3"
 
     mpyc = { path = "./mpyc-web-py/mpyc/", develop = true }