final py/js/declvm -> *ctrl renames

microsoft · Jan 11, 2024 · 2e3ace8 · 2e3ace8
1 parent 8af4cb0
commit 2e3ace8
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/declctrl/Cargo.toml b/declctrl/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "aici_declvm"
+name = "aici_declctrl"
 version = "0.1.0"
 edition = "2021"
 
@@ -17,5 +17,5 @@ vob = "3.0.3"
 rustc-hash = "1.1.0"
 
 [[bin]]
-name = "aici_declvm"
+name = "aici_declctrl"
 path = "src/declctrl.rs"
diff --git a/declctrl/wasm.sh b/declctrl/wasm.sh
@@ -4,7 +4,7 @@ set -x
 set -e
 cargo build --release
 BIN=$(cd ../target; pwd)
-cp $BIN/wasm32-wasi/release/aici_declvm.wasm $BIN/opt.wasm
+cp $BIN/wasm32-wasi/release/aici_declctrl.wasm $BIN/opt.wasm
 ls -l $BIN/opt.wasm
 if [ "X$1" = "Xbuild" ] ; then
   exit

diff --git a/jsctrl/Cargo.toml b/jsctrl/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "aici_jsvm"
+name = "aici_jsctrl"
 version = "0.1.0"
 edition = "2021"
 
@@ -19,7 +19,7 @@ rquickjs = { git = "https://github.com/mmoskal/rquickjs", rev = "5b0e3b24d5021d3
 # rquickjs = { path = "../tmp/rquickjs", features = ["array-buffer", "macro"] }
 
 [[bin]]
-name = "aici_jsvm"
+name = "aici_jsctrl"
 path = "src/jsctrl.rs"
 
 [build-dependencies]

diff --git a/jsctrl/ts/aici.js b/jsctrl/ts/aici.js
@@ -395,7 +395,7 @@ export class AiciAsync {
         this.post_process = this.post_process.bind(this);
         f()
             .then(async () => {
-            console.log("JSVM: done");
+            console.log("JsCtrl: done");
             while (true) {
                 await new StopToken().run();
             }

diff --git a/promptlib/notebooks/aici_server_example.ipynb b/promptlib/notebooks/aici_server_example.ipynb
@@ -720,7 +720,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",
@@ -776,7 +776,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",
@@ -814,7 +814,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",
@@ -838,7 +838,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",
@@ -877,7 +877,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",
@@ -925,7 +925,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",
@@ -962,7 +962,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",
@@ -2125,7 +2125,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
@@ -2153,7 +2153,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
@@ -2237,7 +2237,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrlrlrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",

diff --git a/promptlib/notebooks/ignore-check.ipynb b/promptlib/notebooks/ignore-check.ipynb
@@ -48,7 +48,7 @@
     }
    ],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",

diff --git a/promptlib/notebooks/test_token_boundaries.ipynb b/promptlib/notebooks/test_token_boundaries.ipynb
@@ -43,7 +43,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declvm/target/opt.wasm\")\n",
+    "ep = AICI(base_url=\"http://127.0.0.1:8080/v1/\", wasm_runner_path=\"/workspaces/aici/declctrl/target/opt.wasm\")\n",
     "\n",
     "endpoint = PromptNode().set_endpoint(ep)\n",
     "\n",

diff --git a/pyctrl/Cargo.toml b/pyctrl/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "aici_pyvm"
+name = "aici_pyctrl"
 version = "0.1.0"
 edition = "2021"
 
@@ -18,7 +18,7 @@ once_cell = "1.18.0"
 indexmap = { version = "2.1.0", features = ["std"] }
 
 [[bin]]
-name = "aici_pyvm"
+name = "aici_pyctrl"
 path = "src/pyctrl.rs"
 
 [build-dependencies]

diff --git a/pyctrl/wasm.sh b/pyctrl/wasm.sh
@@ -4,7 +4,7 @@ set -x
 set -e
 cargo build --release
 BIN=$(cd ../target; pwd)
-cp $BIN/wasm32-wasi/release/aici_pyvm.wasm $BIN/opt.wasm
+cp $BIN/wasm32-wasi/release/aici_pyctrl.wasm $BIN/opt.wasm
 ls -l $BIN/opt.wasm
 # curl -X POST -T "$BIN/opt.wasm" "http://127.0.0.1:8080/v1/aici_modules"
 if [ "X$1" = "Xbuild" ] ; then

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -19,7 +19,7 @@ def upload_wasm():
     )
     if r.returncode != 0:
         sys.exit(1)
-    file_path = prj_dir + "/target/wasm32-wasi/release/aici_declvm.wasm"
+    file_path = prj_dir + "/target/wasm32-wasi/release/aici_declctrl.wasm"
     pyaici.rest.log_level = 0
     ast_module = pyaici.rest.upload_module(file_path)