Merge pull request #33 from arcmindai/dev

dfx upgrade and refactoring
arcmindai · May 5, 2024 · 4965ffe · 4965ffe
2 parents 292dfa1 + f6c13a3
commit 4965ffe
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 62 deletions.
diff --git a/.github/workflows/assign-owner.yml b/.github/workflows/assign-owner.yml
@@ -28,7 +28,7 @@ jobs:
  - name: Install DFX
  uses: dfinity/setup-dfx@main
  with:
- dfx-version: '0.15.2'
+ dfx-version: '0.19.0'
  - name: Add DFX identity and wallets
  run: ./scripts/add-ic-identity.sh
  env:

diff --git a/.github/workflows/deploy-new.yml b/.github/workflows/deploy-new.yml
@@ -22,7 +22,7 @@ jobs:
  - name: Install DFX
  uses: dfinity/setup-dfx@main
  with:
- dfx-version: '0.15.2'
+ dfx-version: '0.19.0'
  - name: Fetch git submodule arcmindvector
  run: git submodule update --init --recursive
  - name: Add DFX identity and wallets
@@ -42,7 +42,7 @@ jobs:
  BEAMFI_PRINCIPAL: ${{ secrets.BEAMFI_PRINCIPAL }}
  BILLING_KEY: ${{ secrets.BILLING_KEY }}
  BATTERY_API_KEY: ${{ secrets.BATTERY_API_KEY }}
- BATTERY_PRINCIAL: ${{ secrets.BATTERY_PRINCIAL }}
+ BATTERY_PRINCIPAL: ${{ secrets.BATTERY_PRINCIPAL }}
  - name: Debug URL
  run: echo https://completedeploy-4gbndkvjta-uc.a.run.app?apiKey=${{ secrets.FB_API_KEY }}&canisterId=${{ steps.provision.outputs.controller_principal }}
  - name: Call Firebase Function /complete_deploy and assert HTTP status 200

diff --git a/.github/workflows/local-test.yml b/.github/workflows/local-test.yml
@@ -23,7 +23,7 @@ jobs:
  - name: Install DFX
  uses: dfinity/setup-dfx@main
  with:
- dfx-version: '0.15.2'
+ dfx-version: '0.19.0'
  - name: Add DFX identity and wallets
  run: ./scripts/add-ic-identity.sh
  env:
@@ -45,6 +45,6 @@ jobs:
  BEAMFI_PRINCIPAL: ${{ secrets.BEAMFI_PRINCIPAL }}
  BILLING_KEY: ${{ secrets.BILLING_KEY }}
  BATTERY_API_KEY: ${{ secrets.BATTERY_API_KEY }}
- BATTERY_PRINCIAL: ${{ secrets.BATTERY_PRINCIAL }}
+ BATTERY_PRINCIPAL: ${{ secrets.BATTERY_PRINCIPAL }}
  - name: Show Controller Principal
  run: echo ${{ steps.provision.outputs.controller_principal }}
diff --git a/.github/workflows/old-prod-update.yml b/.github/workflows/old-prod-update.yml
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,6 +5,7 @@ members = [
  "src/arcmindai_tools",
  "src/cycles_battery"
 ]
+resolver = "1"
 
 [profile.release]
 lto = true

diff --git a/README.md b/README.md
@@ -141,6 +141,15 @@ awk 'NF {sub(/\r/, ""); printf "%s\\r\\n",$0;}' ~/.config/dfx/identity/default/i
 cat ~/.config/dfx/identity/default/wallets.json
 ```
 
+### Update arcmindvector Git submodule to the latest
+
+- make sure arcmindvector Git project has the latest changes pushed to the main branch
+- update the submodule in the parent project `arcmindai`:
+
+```
+git submodule update --remote
+```
+
 ## License
 
 See the [License](LICENSE) file for license rights and limitations (MIT).

diff --git a/arcmindvector b/arcmindvector
diff --git a/scripts/deploy_brain.sh b/scripts/deploy_brain.sh
@@ -17,7 +17,7 @@ GPT_MODEL=gpt-4
 
 # Deploy brain canister 
 CONTROLLER_PRINCIPAL=$(dfx canister --network $IC_NETWORK id arcmindai_controller)
-BATTERY_PRINCIAL=$(dfx canister --network $IC_NETWORK id cycles_battery)
+BATTERY_PRINCIPAL=$(dfx canister --network $IC_NETWORK id cycles_battery)
 
-echo Deploying brain canister with owner=$CONTROLLER_PRINCIPAL, GPT model=$GPT_MODEL and OPENAI_API_KEY=$OPENAI_API_KEY, BATTERY_PRINCIAL=$BATTERY_PRINCIAL, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
-dfx deploy --network $IC_NETWORK arcmindai_brain --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$OPENAI_API_KEY\", \"$GPT_MODEL\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIAL\")"
+echo Deploying brain canister with owner=$CONTROLLER_PRINCIPAL, GPT model=$GPT_MODEL and OPENAI_API_KEY=$OPENAI_API_KEY, BATTERY_PRINCIPAL=$BATTERY_PRINCIPAL, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
+dfx deploy --network $IC_NETWORK arcmindai_brain --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$OPENAI_API_KEY\", \"$GPT_MODEL\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIPAL\")"
diff --git a/scripts/deploy_controller.sh b/scripts/deploy_controller.sh
@@ -31,12 +31,10 @@ IC_NETWORK=${IC_NETWORK:-local}
 
 BRAIN_PRINCIPAL=$(dfx canister --network $IC_NETWORK id arcmindai_brain)
 TOOLS_PRINCIPAL=$(dfx canister --network $IC_NETWORK id arcmindai_tools)
-BATTERY_PRINCIAL=$(dfx canister --network $IC_NETWORK id cycles_battery)
+BATTERY_PRINCIPAL=$(dfx canister --network $IC_NETWORK id cycles_battery)
 
 BROWSE_WEBSITE_GPT_MODEL=gpt-3.5-turbo-1106
 
 # Deploy controller canister
-# echo Deploying controller canister with owner=$OWNER_PRINCIPAL, brain=$BRAIN_PRINCIPAL, browse_website_gpt_model=$BROWSE_WEBSITE_GPT_MODEL, tools=$TOOLS_PRINCIPAL, VECTOR_PRINCIPAL=$VECTOR_PRINCIPAL, BEAMFI_PRINCIPAL=$BEAMFI_PRINCIPAL, BATTERY_PRINCIAL=$BATTERY_PRINCIAL, BILLING_KEY=$BILLING_KEY, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
-# dfx deploy --network $IC_NETWORK --mode reinstall arcmindai_controller --argument "(opt principal \"$OWNER_PRINCIPAL\", opt principal \"$BRAIN_PRINCIPAL\", opt principal \"$TOOLS_PRINCIPAL\", opt principal \"$VECTOR_PRINCIPAL\", opt principal \"$BEAMFI_PRINCIPAL\", opt principal \"$BATTERY_PRINCIAL\", opt \"$BROWSE_WEBSITE_GPT_MODEL\", opt \"$BILLING_KEY\", opt \"$BATTERY_API_KEY\")"
-echo Deploying controller canister BATTERY_PRINCIAL=$BATTERY_PRINCIAL, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
-dfx deploy --network $IC_NETWORK arcmindai_controller --argument "(opt principal \"$OWNER_PRINCIPAL\", opt principal \"$BRAIN_PRINCIPAL\", opt principal \"$TOOLS_PRINCIPAL\", opt principal \"$VECTOR_PRINCIPAL\", opt principal \"$BEAMFI_PRINCIPAL\", opt principal \"$BATTERY_PRINCIAL\", opt \"$BROWSE_WEBSITE_GPT_MODEL\", opt \"$BILLING_KEY\", opt \"$BATTERY_API_KEY\")"
+echo Deploying controller canister BATTERY_PRINCIPAL=$BATTERY_PRINCIPAL, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
+dfx deploy --network $IC_NETWORK arcmindai_controller --argument "(opt principal \"$OWNER_PRINCIPAL\", opt principal \"$BRAIN_PRINCIPAL\", opt principal \"$TOOLS_PRINCIPAL\", opt principal \"$VECTOR_PRINCIPAL\", opt principal \"$BEAMFI_PRINCIPAL\", opt principal \"$BATTERY_PRINCIPAL\", opt \"$BROWSE_WEBSITE_GPT_MODEL\", opt \"$BILLING_KEY\", opt \"$BATTERY_API_KEY\")"
diff --git a/scripts/deploy_tools.sh b/scripts/deploy_tools.sh
@@ -20,11 +20,11 @@ fi
 IC_NETWORK=${IC_NETWORK:-local}
 
 CONTROLLER_PRINCIPAL=$(dfx canister --network $IC_NETWORK id arcmindai_controller)
-BATTERY_PRINCIAL=$(dfx canister --network $IC_NETWORK id cycles_battery)
+BATTERY_PRINCIPAL=$(dfx canister --network $IC_NETWORK id cycles_battery)
 
 # Deploy tools canister
-echo Deploying tools canister with owner=$CONTROLLER_PRINCIPAL on $IC_NETWORK, GOOGLE_API_KEY=$GOOGLE_API_KEY, GOOGLE_SEARCH_ENGINE_ID=$GOOGLE_SEARCH_ENGINE_ID, BATTERY_PRINCIAL=$BATTERY_PRINCIAL, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
-dfx deploy --network $IC_NETWORK arcmindai_tools --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$GOOGLE_API_KEY\", \"$GOOGLE_SEARCH_ENGINE_ID\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIAL\" )"
+echo Deploying tools canister with owner=$CONTROLLER_PRINCIPAL on $IC_NETWORK, GOOGLE_API_KEY=$GOOGLE_API_KEY, GOOGLE_SEARCH_ENGINE_ID=$GOOGLE_SEARCH_ENGINE_ID, BATTERY_PRINCIPAL=$BATTERY_PRINCIPAL, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
+dfx deploy --network $IC_NETWORK arcmindai_tools --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$GOOGLE_API_KEY\", \"$GOOGLE_SEARCH_ENGINE_ID\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIPAL\" )"
 
 echo Tools Owner:
 dfx canister --network $IC_NETWORK call arcmindai_tools get_owner
diff --git a/scripts/provision-instance.sh b/scripts/provision-instance.sh
@@ -36,8 +36,8 @@ if [[ -z "${BATTERY_API_KEY}" ]]; then
  exit 1
 fi
 
-if [[ -z "${BATTERY_PRINCIAL}" ]]; then
- echo "BATTERY_PRINCIAL is unset."
+if [[ -z "${BATTERY_PRINCIPAL}" ]]; then
+ echo "BATTERY_PRINCIPAL is unset."
  exit 1
 fi
 
@@ -64,26 +64,26 @@ cd ../
 pwd
 
 # Deploy brain canister 
-echo Deploying brain canister with owner $CONTROLLER_PRINCIPAL, GPT model $GPT_MODEL, openai_api_key $OPENAI_API_KEY, BATTERY_API_KEY=$BATTERY_API_KEY, BATTERY_PRINCIAL=$BATTERY_PRINCIAL on $IC_NETWORK
-dfx deploy --network $IC_NETWORK arcmindai_brain --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$OPENAI_API_KEY\", \"$GPT_MODEL\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIAL\")"
+echo Deploying brain canister with owner $CONTROLLER_PRINCIPAL, GPT model $GPT_MODEL, openai_api_key $OPENAI_API_KEY, BATTERY_API_KEY=$BATTERY_API_KEY, BATTERY_PRINCIPAL=$BATTERY_PRINCIPAL on $IC_NETWORK
+dfx deploy --network $IC_NETWORK arcmindai_brain --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$OPENAI_API_KEY\", \"$GPT_MODEL\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIPAL\")"
 
 echo Brain Owner:
 dfx canister --network $IC_NETWORK call arcmindai_brain get_owner
 
 BRAIN_PRINCIPAL=$(dfx canister --network $IC_NETWORK id arcmindai_brain)
 
 # Deploy tools canister
-echo Deploying tools canister with owner $CONTROLLER_PRINCIPAL on $IC_NETWORK with GOOGLE_API_KEY=$GOOGLE_API_KEY, GOOGLE_SEARCH_ENGINE_ID=$GOOGLE_SEARCH_ENGINE_ID, BATTERY_API_KEY=$BATTERY_API_KEY, BATTERY_PRINCIAL=$BATTERY_PRINCIAL on $IC_NETWORK
-dfx deploy --network $IC_NETWORK arcmindai_tools --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$GOOGLE_API_KEY\", \"$GOOGLE_SEARCH_ENGINE_ID\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIAL\")"
+echo Deploying tools canister with owner $CONTROLLER_PRINCIPAL on $IC_NETWORK with GOOGLE_API_KEY=$GOOGLE_API_KEY, GOOGLE_SEARCH_ENGINE_ID=$GOOGLE_SEARCH_ENGINE_ID, BATTERY_API_KEY=$BATTERY_API_KEY, BATTERY_PRINCIPAL=$BATTERY_PRINCIPAL on $IC_NETWORK
+dfx deploy --network $IC_NETWORK arcmindai_tools --argument "(opt principal \"$CONTROLLER_PRINCIPAL\", \"$GOOGLE_API_KEY\", \"$GOOGLE_SEARCH_ENGINE_ID\", opt \"$BATTERY_API_KEY\", opt principal \"$BATTERY_PRINCIPAL\")"
 
 echo Tools Owner:
 dfx canister --network $IC_NETWORK call arcmindai_tools get_owner
 
 TOOLS_PRINCIPAL=$(dfx canister --network $IC_NETWORK id arcmindai_tools)
 
 # Deploy controller canister
-echo Deploying controller canister with owner=$OWNER_PRINCIPAL, brain=$BRAIN_PRINCIPAL, browse_website_gpt_model=$BROWSE_WEBSITE_GPT_MODEL, tools=$TOOLS_PRINCIPAL, VECTOR_PRINCIPAL=$VECTOR_PRINCIPAL, BEAMFI_PRINCIPAL=$BEAMFI_PRINCIPAL, BATTERY_PRINCIAL=$BATTERY_PRINCIAL, BILLING_KEY=$BILLING_KEY, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
-dfx deploy --network $IC_NETWORK arcmindai_controller --argument "(opt principal \"$OWNER_PRINCIPAL\", opt principal \"$BRAIN_PRINCIPAL\", opt principal \"$TOOLS_PRINCIPAL\", opt principal \"$VECTOR_PRINCIPAL\", opt principal \"$BEAMFI_PRINCIPAL\", opt principal \"$BATTERY_PRINCIAL\", opt \"$BROWSE_WEBSITE_GPT_MODEL\", opt \"$BILLING_KEY\", opt \"$BATTERY_API_KEY\")"
+echo Deploying controller canister with owner=$OWNER_PRINCIPAL, brain=$BRAIN_PRINCIPAL, browse_website_gpt_model=$BROWSE_WEBSITE_GPT_MODEL, tools=$TOOLS_PRINCIPAL, VECTOR_PRINCIPAL=$VECTOR_PRINCIPAL, BEAMFI_PRINCIPAL=$BEAMFI_PRINCIPAL, BATTERY_PRINCIPAL=$BATTERY_PRINCIPAL, BILLING_KEY=$BILLING_KEY, BATTERY_API_KEY=$BATTERY_API_KEY on $IC_NETWORK
+dfx deploy --network $IC_NETWORK arcmindai_controller --argument "(opt principal \"$OWNER_PRINCIPAL\", opt principal \"$BRAIN_PRINCIPAL\", opt principal \"$TOOLS_PRINCIPAL\", opt principal \"$VECTOR_PRINCIPAL\", opt principal \"$BEAMFI_PRINCIPAL\", opt principal \"$BATTERY_PRINCIPAL\", opt \"$BROWSE_WEBSITE_GPT_MODEL\", opt \"$BILLING_KEY\", opt \"$BATTERY_API_KEY\")"
 
 echo Controller Owner:
 dfx canister --network $IC_NETWORK call arcmindai_controller get_owner

diff --git a/src/arcmindai_brain/src/lib.rs b/src/arcmindai_brain/src/lib.rs
@@ -417,6 +417,8 @@ fn post_upgrade(
  s.borrow_mut().battery_canister = battery_canister;
  s.borrow_mut().battery_api_key = battery_api_key.clone();
  });
+
+ start_cycles_check_timer(CYCLES_BALANCE_CHECK_MIN_INTERVAL_SECS);
 }
 
 // ---------------------- Candid declarations did file generator ----------------------

diff --git a/src/arcmindai_tools/src/lib.rs b/src/arcmindai_tools/src/lib.rs
@@ -378,6 +378,8 @@ fn post_upgrade(
  s.borrow_mut().battery_canister = battery_canister;
  s.borrow_mut().battery_api_key = battery_api_key.clone();
  });
+
+ start_cycles_check_timer(CYCLES_BALANCE_CHECK_MIN_INTERVAL_SECS);
 }
 
 // ---------------------- Candid declarations did file generator ----------------------