Refactor: remove all traps; return Result of Record

nft_get_story returns a StoryRecordResult . InferenceRecordResult returned by inference, nft_story_xxx . update scripts for InferenceRecordResult Remove all references to charles Remove trap calls Refactor trap in set_canister_mode initialize returns StatusCodeRecordResult , and does not trap nft_whitelist, nft_init, nft_mint: no trap; StatusCodeRecordResult nft_metadata; no trap; NFTCollectionRecordResult no trap in get_users; UsersRecordResult fix pytest no trap in get_user_metadata StatusCodeRecordResult everywhere; No more traps Return Err when malloc fails fix pytest
icppWorld · Mar 29, 2024 · c9d56b1 · c9d56b1
1 parent 890efac
commit c9d56b1
Show file tree

Hide file tree

Showing 31 changed files with 908 additions and 440 deletions.
diff --git a/icpp_llama2/README.md b/icpp_llama2/README.md
@@ -36,6 +36,9 @@
    Invoke-WebRequest -Uri https://huggingface.co/karpathy/tinyllamas/resolve/main/stories15M.bin -OutFile .\models\stories15M.bin
    ```
 
+- The demo_pytest.sh script starts the local network, deploys llama2_260K, uploads the model & tokenizer, and runs the QA with pytest:
+  - `./demo_pytest.sh`  , on Linux / Mac
+
 - The *demo* script starts the local network, deploys llama2, uploads the model & tokenizer, and generates two stories:
   - `./demo.sh`  , on Linux / Mac
   - `.\demo.ps1` , in Windows PowerShell (Miniconda recommended)

diff --git a/icpp_llama2/canister_ids.json b/icpp_llama2/canister_ids.json
@@ -1,7 +1,4 @@
 {
-  "charles": {
-    "ic": "lkh5o-3yaaa-aaaag-acguq-cai"
-  },
   "llama2": {
     "ic": "4c4bn-daaaa-aaaag-abvcq-cai"
   },

diff --git a/icpp_llama2/demo.sh b/icpp_llama2/demo.sh
@@ -24,14 +24,30 @@ icpp build-wasm --to-compile all
 echo " "
 echo "--------------------------------------------------"
 echo "Deploying the wasm to a canister on the local network"
-dfx deploy
+dfx deploy llama2_260K
+dfx deploy llama2
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Setting canister_mode to chat-principal"
+dfx canister call llama2_260K set_canister_mode chat-principal
+dfx canister call llama2 set_canister_mode chat-principal
 
 #######################################################################
 echo " "
 echo "--------------------------------------------------"
 echo "Checking health endpoint"
+dfx canister call llama2_260K health
 dfx canister call llama2 health
 
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Initializing the canister configurations"
+python -m scripts.nft_init --network local --canister llama2_260K --nft-supply-cap 0 --nft-symbol "" --nft-name "" --nft-description ""
+python -m scripts.nft_init --network local --canister llama2 --nft-supply-cap 0 --nft-symbol "" --nft-name "" --nft-description ""
+
 #######################################################################
 echo " "
 echo "--------------------------------------------------"
@@ -43,6 +59,7 @@ python -m scripts.upload --canister llama2 --model models/stories15M.bin --token
 echo " "
 echo "--------------------------------------------------"
 echo "Checking readiness endpoint"
+dfx canister call llama2_260K ready
 dfx canister call llama2 ready
 
 #######################################################################

diff --git a/icpp_llama2/demo_pytest.sh b/icpp_llama2/demo_pytest.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+dfx identity use default
+
+#######################################################################
+# For Linux & Mac
+#######################################################################
+
+echo " "
+echo "--------------------------------------------------"
+echo "Stopping the local network"
+dfx stop
+
+echo " "
+echo "--------------------------------------------------"
+echo "Starting the local network as a background process"
+dfx start --clean --background
+
+#######################################################################
+echo "--------------------------------------------------"
+echo "Building the wasm with wasi-sdk"
+# icpp build-wasm --to-compile all
+icpp build-wasm --to-compile mine
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Deploying the wasm to a canister on the local network"
+dfx deploy llama2_260K
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Setting canister_mode to chat-principal"
+dfx canister call llama2_260K set_canister_mode chat-principal
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Checking health endpoint"
+dfx canister call llama2_260K health
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Initializing the canister configurations"
+python -m scripts.nft_init --network local --canister llama2_260K --nft-supply-cap 0 --nft-symbol "" --nft-name "" --nft-description ""
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Uploading the model & tokenizer"
+python -m scripts.upload --network local --canister llama2_260K --model stories260K/stories260K.bin --tokenizer stories260K/tok512.bin
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Checking readiness endpoint"
+dfx canister call llama2_260K ready
+
+#######################################################################
+echo " "
+echo "--------------------------------------------------"
+echo "Running the full smoketests with pytest"
+pytest --network=local
+
+#######################################################################
+# echo "--------------------------------------------------"
+# echo "Stopping the local network"
+# dfx stop
+
+# #######################################################################
+# echo " "
+# echo "--------------------------------------------------"
+# echo "Building the OS native debug executable with clang++"
+# icpp build-native --to-compile all
+# # icpp build-native --to-compile mine
+
+# #######################################################################
+# echo " "
+# echo "--------------------------------------------------"
+# echo "Running the OS native debug executable"
+# ./build-native/mockic.exe
diff --git a/icpp_llama2/dfx.json b/icpp_llama2/dfx.json
@@ -20,11 +20,6 @@
       "type": "custom",
       "candid": "src/llama2.did",
       "wasm": "build/llama2.wasm"
-    },
-    "charles": {
-      "type": "custom",
-      "candid": "src/llama2.did",
-      "wasm": "build/llama2.wasm"
     }
   },
   "defaults": {