Skip to content

Commit

Permalink
Merge branch 'develop' into fix/continue-double-response
Browse files Browse the repository at this point in the history
  • Loading branch information
azep-ninja authored Dec 31, 2024
2 parents 6810264 + 76b93a5 commit 3d2b488
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
1 change: 1 addition & 0 deletions packages/core/src/generation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ export async function generateText({

case ModelProviderName.GOOGLE: {
const google = createGoogleGenerativeAI({
apiKey,
fetch: runtime.fetch,
});

Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function loadEnvConfig(): Settings {
const result = config(envPath ? { path: envPath } : {});

if (!result.error) {
console.log(`Loaded .env file from: ${envPath}`);
elizaLogger.log(`Loaded .env file from: ${envPath}`);
}

// Parse namespaced settings
Expand Down Expand Up @@ -156,10 +156,10 @@ function parseNamespacedSettings(env: Settings): NamespacedSettings {
for (const [key, value] of Object.entries(env)) {
if (!value) continue;

const [namespace, ...rest] = key.split('.');
const [namespace, ...rest] = key.split(".");
if (!namespace || rest.length === 0) continue;

const settingKey = rest.join('.');
const settingKey = rest.join(".");
namespaced[namespace] = namespaced[namespace] || {};
namespaced[namespace][settingKey] = value;
}
Expand Down
5 changes: 3 additions & 2 deletions packages/core/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ export default defineConfig({
platform: "node",
target: "node18",
bundle: true,
splitting: true, // Add this for better code splitting
dts: true, // Generate declaration files
splitting: true, // Add this for better code splitting
dts: true, // Generate declaration files
external: [
"dotenv", // Externalize dotenv to prevent bundling
"fs", // Externalize fs to use Node.js built-in module
"path", // Externalize other built-ins if necessary
"http",
"https",
// Add other modules you want to externalize
"@tavily/core",
],
});
3 changes: 2 additions & 1 deletion scripts/clean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ cd "$(dirname "$0")"/..
echo "Cleanup started."
# Find and remove node_modules directories, dist directories.
find . -type d -name "node_modules" -exec rm -rf {} + \
-o -type d -name "dist" -exec rm -rf {} +
-o -type d -name "dist" -exec rm -rf {} + \
-o -type d -name ".turbo" -exec rm -rf {} +

# Remove core cache
rm -rf ./packages/core/cache
Expand Down
5 changes: 4 additions & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
},
"@elizaos/plugin-solana#build": {
"outputs": ["dist/**"],
"dependsOn": ["@elizaos/plugin-trustdb#build"]
"dependsOn": [
"@elizaos/plugin-trustdb#build",
"@elizaos/plugin-tee#build"
]
},
"@elizaos/plugin-nft-generation#build": {
"outputs": ["dist/**"],
Expand Down

0 comments on commit 3d2b488

Please sign in to comment.