0.0.0-hotfix.1

Author: 0x77dev

bun.lockb

@@ -7,6 +7,7 @@
     "packages/*",
     "skill/*",
     "docs",
+    "scripts",
     "server"
   ],
   "resolutions": {

package.json

@@ -24,5 +24,6 @@
   },
   "trustedDependencies": [
     "hnswlib-node"
-  ]
-}
+  ],
+  "version": "0.0.0-hotfix.1"
+}

packages/lang/package.json

@@ -12,5 +12,6 @@
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
-  }
-}
+  },
+  "version": "0.0.0-hotfix.1"
+}

packages/oai-types/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@ava/workspace-scripts",
+  "module": "index.ts",
+  "type": "module",
+  "devDependencies": {
+    "@types/bun": "latest",
+    "@types/js-yaml": "^4.0.9"
+  },
+  "peerDependencies": {
+    "typescript": "^5.0.0"
+  },
+  "dependencies": {
+    "js-yaml": "^4.1.0"
+  }
+}

scripts/package.json

@@ -0,0 +1,62 @@
+import { $, Glob } from "bun"
+import { readFile, writeFile } from "fs/promises"
+import { semver } from "bun"
+import { load, dump } from "js-yaml"
+
+const branch = (await $`git rev-parse --abbrev-ref HEAD`.text()).trim();
+
+if (branch !== "main") {
+  console.error("Release is only allowed from main branch");
+  process.exit(1);
+}
+
+const newVersion = process.argv[2];
+if (!newVersion) {
+  console.error("Version is required");
+  process.exit(1);
+}
+
+const packagesGlob = new Glob("{**,*,.}/{*,.}/package.json");
+
+console.info('patching all js packages to', newVersion);
+for await (const p of packagesGlob.scan()) {
+  if (p.includes("node_modules")) continue;
+  const data = JSON.parse(await readFile(p, "utf-8"));
+  const version = data.version || "0.0.0";
+  const name = data.name;
+  const diff = semver.order(newVersion, version);
+  if (!diff) {
+    console.log('no change for', `${name}@${version},`, "semver diff:", diff);
+    continue
+  }
+  console.log(`patching ${name}@${version} -> ${name}@${newVersion}`);
+  data.version = newVersion;
+  await writeFile(p, JSON.stringify(data, null, 2));
+  await $`git add ${p}`;
+}
+
+console.log('patching home assistant add-ons to', newVersion);
+const addonsGlob = new Glob("{server}/config.{yml,yaml}");
+for await (const p of addonsGlob.scan()) {
+  const data = load(await readFile(p, "utf-8")) as any;
+  const version = data.version || "0.0.0";
+  const name = data.name;
+  const diff = semver.order(newVersion, version);
+  if (!diff) {
+    console.log('no change for', `${name}@${version},`, "semver diff:", diff);
+    continue
+  }
+
+  console.log(`patching ${name}@${version} -> ${name}@${newVersion}`);
+  data.version = newVersion;
+  await writeFile(p, dump(data));
+  await $`git add ${p}`;
+}
+
+console.log('installing dependencies to update lock files');
+await $`bun install`;
+
+console.log('committing changes');
+await $`git commit -m "${newVersion}"`;
+await $`git tag -a ${newVersion}`;
+await $`git push origin main --tags`;

scripts/release.ts

@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    // Enable latest features
+    "lib": ["ESNext", "DOM"],
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+
+    // Bundler mode
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+
+    // Best practices
+    "strict": true,
+    "skipLibCheck": true,
+    "noFallthroughCasesInSwitch": true,
+
+    // Some stricter flags (disabled by default)
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noPropertyAccessFromIndexSignature": false
+  }
+}

scripts/tsconfig.json

@@ -1,7 +1,9 @@
-name: "Ava Server"
-description: "Self-hosted personal assistant in minutes with built-in Home Assistant integration and great extensibility and customizability"
-version: "0.0.0"
-slug: "server"
+name: Ava Server
+description: >-
+  Self-hosted personal assistant in minutes with built-in Home Assistant
+  integration and great extensibility and customizability
+version: 0.0.0-hotfix.1
+slug: server
 init: false
 arch:
   - aarch64
@@ -17,26 +19,26 @@ ingress_stream: true
 options:
   llm:
     namespace: anthropic
-    token: "your token"
+    token: your token
     name: claude-3-opus-20240229
   embeddings:
     namespace: ollama
-    baseURL: "http://04c4e5a1-ollama:11434"
+    baseURL: http://04c4e5a1-ollama:11434
     name: snowflake-arctic-embed:22m
   skills: []
 schema:
   llm:
     namespace: list(anthropic|openai|ollama)
-    name: "str"
-    token: "str?"
-    baseURL: "str?"
+    name: str
+    token: str?
+    baseURL: str?
   embeddings:
     namespace: list(openai|ollama)
-    name: "str"
-    token: "str?"
-    baseURL: "str?"
+    name: str
+    token: str?
+    baseURL: str?
   skills:
-    - name: "str"
-      description: "str"
-      returnDirect: "bool?"
-      url: "str"
+    - name: str
+      description: str
+      returnDirect: bool?
+      url: str

server/config.yaml

@@ -11,12 +11,19 @@ export const createDynamicToolkit = async (): Promise<ToolInterface[]> => {
       description: skill.description,
       returnDirect: skill.returnDirect,
       async func(body) {
-        const response = await http.post(skill.url, {
-          body,
-          responseType: 'json'
-        }).text()
+        const res = await fetch(skill.url, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(body),
+        })
 
-        return response
+        if (!res.ok) {
+          throw new Error(`Failed to call skill ${skill.name}, status: ${res.status}, body: ${await res.text()}`)
+        }
+
+        return res.text()
       }
     })
   })

skill/dynamic/index.ts

@@ -2,7 +2,7 @@
   "name": "@ava/skill-dynamic",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.0",
+  "version": "0.0.0-hotfix.1",
   "devDependencies": {
     "@types/bun": "latest"
   },
@@ -15,4 +15,4 @@
     "znv": "^0.4.0",
     "zod": "^3.23.0"
   }
-}
+}