just fetching upstream & merge

Author: o-on-x

packages/core/elizaConfig.example.yaml

@@ -1,6 +1,6 @@
 # Load custom actions from the actions directory
 
-# Close this into a elizaConfig.yaml file that is ignored by git
+# Clone this into a elizaConfig.yaml file that is ignored by git
 
 # Paths are relative to the core/src directory
 

packages/core/src/core/defaultCharacter.ts

@@ -1,12 +1,13 @@
-import { Character, ModelProvider } from "./types.ts";
+import { Character, ModelProvider, Clients } from "./types.ts";
 
 export const defaultCharacter: Character = {
     name: "Eliza",
     plugins: [],
     clients: [],
     modelProvider: ModelProvider.LLAMALOCAL,
     settings: {
-        secrets: {},
+        secrets: {
+        },
         voice: {
             model: "en_US-hfc_female-medium",
         },

packages/core/src/services/llama.ts

@@ -11,11 +11,13 @@ class LlamaService implements ILlamaService {
     private delegate: ILlamaService;
 
     private constructor() {
-      const provider = settings.LOCAL_LLAMA_PROVIDER;
+      const provider = process.env.LOCAL_LLAMA_PROVIDER;
       console.log("provider: ", provider)
-      if (provider === ModelProvider.OLLAMA) {
+      if (true){//provider === ModelProvider.OLLAMA) {
+        console.log("running ollama")
         this.delegate = OllamaService.getInstance();
       } else {
+        console.log("running llama-cpp")
         this.delegate = LlamaCppService.getInstance();
       }
     }