@1kbirds/chidori 0.1.21 → 0.1.24

package/.pytest_cache/README.md

@@ -0,0 +1,8 @@
+# pytest cache directory #
+
+This directory contains data from the pytest's cache plugin,
+which provides the `--lf` and `--ff` options, as well as the `cache` fixture.
+
+**Do not** commit this to version control.
+
+See [the docs](https://docs.pytest.org/en/stable/how-to/cache.html) for more information.

package/CHANGELOG.md

@@ -0,0 +1,33 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.1.24 (2023-07-28)
+
+### Fixed
+
+- Fixing releases
+
+## 0.1.23 (2023-07-28)
+
+### Fixed
+
+- Fixing releases
+
+## 0.1.22 (2023-07-28)
+
+### Added
+
+
+### Fixed
+
+### Changed
+
+- Moved to SQL queries as triggers to nodes rather than graphql
+
+### Changed
+
+

package/Cargo.toml

@@ -1,7 +1,12 @@
 [package]
 name = "chidori"
-version = "0.1.7"
+version= "0.1.24"
 edition = "2021"
+description = "A Rust library for executing prompt-graph models"
+license = "MIT"
+homepage = "https://docs.thousandbirds.ai"
+repository = "https://github.com/ThousandBirdsInc/chidori"
+
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
@@ -31,7 +36,7 @@ sqlparser = "0.34.0"
 openssl = { version = "0.10", features = ["vendored"] }
 
 once_cell = "1"
-prompt-graph-core = { path = "../prompt-graph-core", version = "0.1.0" }
+prompt-graph-core = { path = "../prompt-graph-core", version = "^0.1.24" }
 wasm-bindgen = {version = "0.2.86", features = []}
 handlebars = "4.3.7"
 anyhow = { version = "1.0", default-features = false }
@@ -53,7 +58,6 @@ pyo3-log = { version = "0.8.2", optional = true }
 
 neon-serde3 = "0.10.0"
 
-tracing = "0.1"
 
 [dependencies.prompt-graph-exec]
 path = "../prompt-graph-exec"
@@ -76,4 +80,4 @@ pyo3-build-config = "0.19.1"
 
 [package.metadata.maturin]
 python-source = "package_python"
-name = "chidori"
+name = "chidori"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1kbirds/chidori",
-  "version": "v0.1.21",
+  "version": "0.1.24",
   "description": "Chidori is a library for building and running reactive AI agents.",
   "main": "package_node/index.js",
   "scripts": {
@@ -8,8 +8,7 @@
     "build-debug": "npm run build --",
     "build-release": "npm run build -- --release",
     "test-rust": "cargo test",
-    "test-js": "jest tests/nodejs",
-    "install": "node-pre-gyp install"
+    "test-js": "jest tests/nodejs"
   },
   "os": [
     "darwin",

package/package_node/index.js

@@ -1,10 +1,7 @@
 "use strict";
 
-const { promisify } = require("util");
-
 const {
     simpleFun,
-    nodehandleDebugExample,
     nodehandleRunWhen,
     nodehandleQuery,
     chidoriNew,
@@ -15,21 +12,37 @@ const {
     chidoriBranch,
     chidoriQuery,
     chidoriGraphStructure,
-    chidoriCustomNode,
-    chidoriDenoCodeNode,
-    chidoriVectorMemoryNode
+    chidoriRegisterCustomNodeHandle,
+    chidoriRunCustomNodeLoop,
+    graphbuilderNew,
+    graphbuilderCustomNode,
+    graphbuilderPromptNode,
+    graphbuilderDenoCodeNode,
+    graphbuilderVectorMemoryNode,
+    graphbuilderCommit
 } = require("./native/chidori.node");
 
+const toSnakeCase = str => str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
 
+const transformKeys = (obj) => {
+    if (Array.isArray(obj)) {
+        return obj.map(val => transformKeys(val));
+    } else if (obj !== null && obj.constructor === Object) {
+        return Object.keys(obj).reduce((accumulator, key) => {
+            accumulator[toSnakeCase(key)] = transformKeys(obj[key]);
+            return accumulator;
+        }, {});
+    }
+    return obj;
+};
 
-// Wrapper class for the boxed `Database` for idiomatic JavaScript usage
 class NodeHandle {
-    constructor() {
-        this.nh = nodehandleDebugExample();
+    constructor(nh) {
+        this.nh = nh;
     }
 
-    runWhen(otherNodeHandle) {
-        return nodehandleRunWhen.call(this.nh, otherNodeHandle);
+    runWhen(graphBuilder, otherNodeHandle) {
+        return nodehandleRunWhen.call(this.nh, graphBuilder.g, otherNodeHandle.nh);
     }
 
     query(branch, frame) {
@@ -43,8 +56,8 @@ class Chidori {
         this.chi = chidoriNew(fileId, url);
     }
 
-    startServer() {
-        return chidoriStartServer.call(this.chi);
+    startServer(filePath) {
+        return chidoriStartServer.call(this.chi, filePath);
     }
 
     objectInterface(executionStatus) {
@@ -55,7 +68,7 @@ class Chidori {
         return chidoriPlay.call(this.chi, branch, frame);
     }
 
-    pause() {
+    pause(branch, frame) {
         return chidoriPause.call(this.chi, branch, frame);
     }
 
@@ -63,34 +76,55 @@ class Chidori {
         return chidoriQuery.call(this.chi, query, branch, frame)
     }
 
-    branch() {
+    branch(branch, frame) {
         return chidoriBranch.call(this.chi, branch, frame);
     }
 
-    graphStructure() {
-        return chidoriGraphStructure.call(this.chi);
+    graphStructure(branch) {
+        return chidoriGraphStructure.call(this.chi, branch);
+    }
+
+    registerCustomNodeHandle(nodeTypeName, handle) {
+        // TODO: we actually pass a callback to the function provided by the user, which they invoke with their result
+        return chidoriRegisterCustomNodeHandle.call(this.chi, nodeTypeName, handle);
+    }
+
+    runCustomNodeLoop() {
+        return chidoriRunCustomNodeLoop.call(this.chi);
     }
 
-    objInterface() {
-        return chidoriObjInterface.call(this.chi, branch, frame);
+}
+
+class GraphBuilder {
+    constructor() {
+        this.g = graphbuilderNew();
     }
 
-    customNode(customNodeCreateOpts) {
-        return chidoriCustomNode.call(this.chi, createCustomNodeOpts);
+    customNode(createCustomNodeOpts) {
+        return new NodeHandle(graphbuilderCustomNode.call(this.g, transformKeys(createCustomNodeOpts)));
+    }
+
+    promptNode(promptNodeCreateOpts) {
+        return new NodeHandle(graphbuilderPromptNode.call(this.g, transformKeys(promptNodeCreateOpts)));
     }
 
     denoCodeNode(denoCodeNodeCreateOpts) {
-        return chidoriDenoCodeNode.call(this.chi, denoCodeNodeCreateOpts);
+        return new NodeHandle(graphbuilderDenoCodeNode.call(this.g, transformKeys(denoCodeNodeCreateOpts)));
     }
 
     vectorMemoryNode(vectorMemoryNodeCreateOpts) {
-        return chidoriVectorMemoryNode.call(this.chi, vectorMemoryNodeCreateOpts);
+        return new NodeHandle(graphbuilderVectorMemoryNode.call(this.g, transformKeys(vectorMemoryNodeCreateOpts)));
+    }
+
+    commit(chidori) {
+        return graphbuilderCommit.call(this.g, chidori.chi, 0);
     }
 }
 
 
 module.exports = {
     Chidori: Chidori,
+    GraphBuilder: GraphBuilder,
     NodeHandle: NodeHandle,
     simpleFun: simpleFun
 };

package/package_python/{chidori.pyi → chidori/chidori.pyi}

@@ -2,13 +2,6 @@ from __future__ import annotations
 
 from typing import *
 
-class NodeHandle:
-    def get_name(self) -> str: ...
-    def run_when(self, node_handle: Optional[NodeHandle]) -> None: ...
-    def query(self, branch: int, frame: int) -> None: ...
-    def __str__(self) -> str: ...
-    def __repr__(self) -> str: ...
-
 class Chidori:
     def start_server(self, file_path: Optional[str]) -> None: ...
     def play(self, branch: int, frame: int) -> None: ...
@@ -20,11 +13,20 @@ class Chidori:
     def list_registered_graphs(self) -> None: ...
     def list_input_proposals(self) -> None: ...
     def list_change_events(self, callback: object) -> None: ...
-    def load_zip_file(self, name: str, output_tables: List[str], output: str, bytes: bytes) -> None: ...
-    def prompt_node(self, name: str, queries: List[Optional[str]], output_tables: List[str], template: str, model: str) -> None: ...
     def poll_local_code_node_execution(self) -> None: ...
     def ack_local_code_node_execution(self, branch: int, counter: int) -> None: ...
     def respond_local_code_node_execution(self, branch: int, counter: int, node_name: str, response: Optional[object]) -> None: ...
+
+class GraphBuilder:
     def custom_node(self, name: str, queries: List[Optional[str]], output_tables: List[str], output: str, node_type_name: str) -> None: ...
     def deno_code_node(self, name: str, queries: List[Optional[str]], output_tables: List[str], output: str, code: str, is_template: bool) -> None: ...
     def vector_memory_node(self, name: str, queries: List[Optional[str]], output_tables: List[str], output: str, template: str, action: str, embedding_model: str, db_vendor: str, collection_name: str) -> None: ...
+    def prompt_node(self, name: str, queries: List[Optional[str]], output_tables: List[str], template: str, model: str) -> None: ...
+    def commit(self, c: Chidori, branch: int) -> None: ...
+
+class NodeHandle:
+    def get_name(self) -> str: ...
+    def run_when(self, node_handle: Optional[NodeHandle]) -> None: ...
+    def query(self, branch: int, frame: int) -> None: ...
+    def __str__(self) -> str: ...
+    def __repr__(self) -> str: ...

package/package_python/{test_chidori.py → chidori/test_chidori.py}

@@ -1,19 +1,20 @@
 import pytest
 from unittest.mock import AsyncMock, MagicMock
-from chidori import Chidori
+from chidori import Chidori, GraphBuilder
 
 
 @pytest.mark.asyncio
 async def test_simple_agent():
     client = Chidori("100", "http://localhost:9800")
+    g = GraphBuilder()
     await client.start_server(":memory:")
-    await client.deno_code_node(
+    await g.deno_code_node(
         name="InspirationalQuote",
         code="""
             return {"promptResult": "placeholder for openai call" }
             """
     )
-    pn = await client.deno_code_node(
+    pn = await g.deno_code_node(
         name="CodeNode",
         queries=["""
             query Q {
@@ -27,8 +28,8 @@ async def test_simple_agent():
             """,
         is_template=True
     )
-    await client.play(0, 0)
-    await pn.query(0, 100)
+    # await g.commit(client, 0)
+    # await client.play(0, 0)
     assert 1 == 1
 
 

package/src/lib.rs

@@ -2,8 +2,9 @@ extern crate protobuf;
 extern crate neon_serde3;
 pub mod translations;
 
-use prompt_graph_core::proto2::{ChangeValue, Path, SerializedValue};
-use prompt_graph_core::proto2::serialized_value::Val;
+pub use prompt_graph_core::proto2::{ChangeValue, Path, SerializedValue};
+pub use prompt_graph_core::proto2::serialized_value::Val;
+pub use prompt_graph_core::proto2::*;
 
 
 /// Our local server implementation is an extension of this. Implementing support for multiple

package/src/translations/mod.rs

@@ -5,4 +5,5 @@ mod python;
 pub mod nodejs;
 
 mod wasm;
-mod rust;
+pub mod rust;
+mod shared;