Merge branch 'canary' into working-vscode

BoundaryML · May 31, 2024 · acbd24f · acbd24f
2 parents 6b93786 + 553bec8
commit acbd24f
Show file tree

Hide file tree

Showing 11 changed files with 450 additions and 264 deletions.
diff --git a/.github/workflows/release_language_client_python.yaml b/.github/workflows/release_language_client_python.yaml
@@ -2,7 +2,7 @@ name: Release language_client_python
 
 on:
   push:
-    branches: ["working-vscode"]
+    branches: ["canary"]
   workflow_dispatch: {}
 
 permissions:
@@ -74,7 +74,6 @@ jobs:
     needs: [build]
     #if: startsWith(github.ref, 'refs/tags/release/')
     #environment: release
-
     steps:
       - uses: actions/download-artifact@v4
       - run: mkdir dist && mv wheels-*/* dist

diff --git a/clients/python/baml_lib/__init__.py b/clients/python/baml_lib/__init__.py
@@ -11,33 +11,3 @@
 
 
 __all__ = ["__version__", "baml_init", "DeserializerException"]
-
-import typing
-from pydantic import BaseModel
-from enum import Enum
-
-
-class MyEnum(str, Enum):
-    FOO = "foo"
-    BAR = "bar"
-
-
-class Foo(BaseModel):
-    bar: str
-    em2: MyEnum = MyEnum.FOO
-
-
-foo = Foo(bar="baz")
-
-
-class Bar(BaseModel):
-    foo: typing.List[Foo]
-    en: MyEnum = MyEnum.BAR
-
-
-bar = Bar(foo=[foo])
-
-
-bar.model_fields.keys()
-
-bar.model_dump_json()
diff --git a/clients/ts/jest.config.js b/clients/ts/jest.config.js
@@ -10,4 +10,7 @@ module.exports = {
   moduleFileExtensions: ["js", "jsx", "ts", "tsx"],
   moduleDirectories: ["node_modules", "src"],
   silent: false,
+  transform: {
+    "^.+\\.(t|j)sx?$": "@swc/jest",
+  },
 };
diff --git a/clients/ts/package.json b/clients/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@boundaryml/baml-core",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "",
   "exports": {
     ".": {
@@ -53,6 +53,8 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@jest/types": "^29.6.3",
+    "@swc/core": "^1.4.17",
+    "@swc/jest": "^0.2.36",
     "@types/jest": "^29.5.11",
     "@types/json-schema": "^7.0.15",
     "@types/node": "^20.11.21",
@@ -67,7 +69,9 @@
     "@anthropic-ai/sdk": "^0.18.0",
     "@azure/openai": "1.0.0-beta.11",
     "@boundaryml/baml-core-ffi": "0.18.0",
+    "@next/env": "^14.2.3",
     "dotenv": "^16.4.5",
+    "dotenv-flow": "^4.1.0",
     "jest-runner": "^29.7.0",
     "json-schema": "^0.4.0",
     "ollama": "^0.5.0",

diff --git a/clients/ts/pnpm-lock.yaml b/clients/ts/pnpm-lock.yaml
diff --git a/clients/ts/src/deserializer/deserializer.ts b/clients/ts/src/deserializer/deserializer.ts
@@ -126,9 +126,19 @@ class Deserializer<T> {
 
     coerce(value: string): T {
         const d = new Diagnostics(value);
+
+        if (this.target?.type === "string") {
+            return value as T;
+        }
+        const _t = this.getInterface(this.target);
+        if (_t.type === "string" && _t.enum === undefined) {
+            return value as T;
+        }
+
         const raw = fromValue(value, d);
 
         const deserializer = this.get_deserializer(this.target);
+
         const response = deserializer.coerce(raw, d, this.get_deserializer.bind(this));
         d.toException();
         return response.as_value;