@1kbirds/chidori 0.1.23 → 0.1.26

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,11 +1,16 @@
 [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]
-name = "chidori"
+name = "_chidori"
 crate-type = ["cdylib", "lib"]
 bench = false
 
@@ -28,10 +33,10 @@ sqlparser = "0.34.0"
 # serde-wasm-bindgen should be used instead
 
 # Vendor protoc and openssl so we don't need to separately install them
-openssl = { version = "0.10", features = ["vendored"] }
+openssl = { version = "0.10.55", 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 }
@@ -72,7 +77,7 @@ wasm-bindgen-test = "0.2"
 tonic-build = "0.9.2"
 pyo3-build-config = "0.19.1"
 
-
-[package.metadata.maturin]
-python-source = "package_python"
-name = "chidori"
+[profile.release]
+lto = "fat"
+codegen-units = 1
+strip = true

package/README.md

@@ -5,3 +5,6 @@
 
 ## Generating Nodejs Client
 - npm run build-release
+
+
+Python patterns were implemented while referring to https://github.com/pydantic/pydantic-core/tree/main/python/pydantic_core

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@1kbirds/chidori",
-  "version": "v0.1.23",
+  "version": "v0.1.26",
   "description": "Chidori is a library for building and running reactive AI agents.",
   "main": "package_node/index.js",
   "scripts": {
-    "build": "cargo-cp-artifact -nc ./package_node/native/chidori.node -- cargo build --message-format=json-render-diagnostics --features nodejs",
+    "build": "cargo-cp-artifact -a cdylib _chidori  ./package_node/native/chidori.node -- cargo build --message-format=json-render-diagnostics --features nodejs",
     "build-debug": "npm run build --",
     "build-release": "npm run build -- --release",
     "test-rust": "cargo test",

package/pyproject.toml

@@ -3,7 +3,7 @@ name = "chidori"
 repository = "https://github.com/thousandbirds/chidori"
 description = "A framework for building LLM based agents"
 authors = [
-    {name = "Colton Pierson"}
+    {name = "Colton Pierson", email = "colton@thousandbirds.ai"}
 ]
 classifiers=[
     "Development Status :: 3 - Alpha",
@@ -29,5 +29,7 @@ requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
 [tool.maturin]
+python-source = "package_python"
+module-name = "chidori._chidori"
+bindings = "pyo3"
 features = ["python"]
-python-source = "package_python"

package/src/translations/python.rs

@@ -402,8 +402,8 @@ async fn get_client(url: String) -> Result<ExecutionRuntimeClient<tonic::transpo
 // TODO: return a handle to nodes so that we can understand and inspect them
 // TODO: include a __repr__ method on those nodes
 
-#[pyclass]
 #[derive(Clone)]
+#[pyclass(name="NodeHandle")]
 struct PyNodeHandle {
     n: NodeHandle,
 }
@@ -746,7 +746,7 @@ impl PyGraphBuilder {
     }
 
     // https://github.com/PyO3/pyo3/issues/525
-    #[pyo3(signature = (name=String::new(), queries=vec!["None".to_string()], output_tables=vec![], output=String::from("type O {}"), node_type_name=String::new()))]
+    #[pyo3(signature = (name=String::new(), queries=vec!["None".to_string()], output_tables=vec![], output=String::from("{}"), node_type_name=String::new()))]
     fn custom_node<'a>(
         mut self_: PyRefMut<'_, Self>,
         py: Python<'a>,
@@ -797,7 +797,7 @@ impl PyGraphBuilder {
     }
 
 
-    #[pyo3(signature = (name=String::new(), queries=vec!["None".to_string()], output_tables=vec![], output=String::from("type O { }"), template=String::new(), action="WRITE".to_string(), embedding_model="TEXT_EMBEDDING_ADA_002".to_string(), db_vendor="QDRANT".to_string(), collection_name=String::new()))]
+    #[pyo3(signature = (name=String::new(), queries=vec!["None".to_string()], output_tables=vec![], output=String::from("{}"), template=String::new(), action="WRITE".to_string(), embedding_model="TEXT_EMBEDDING_ADA_002".to_string(), db_vendor="QDRANT".to_string(), collection_name=String::new()))]
     fn vector_memory_node<'a>(
         mut self_: PyRefMut<'_, Self>,
         py: Python<'a>,
@@ -910,11 +910,12 @@ impl PyGraphBuilder {
 /// the `lib.name` setting in the `Cargo.toml`, else Python will not be able to
 /// import the module.
 #[pymodule]
-#[pyo3(name = "chidori")]
+#[pyo3(name = "_chidori")]
 fn chidori(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
     // pyo3_log::init();
     m.add_class::<PyChidori>()?;
     m.add_class::<PyGraphBuilder>()?;
+    m.add_class::<PyNodeHandle>()?;
     Ok(())
 }
 

package/src/translations/rust.rs

@@ -538,7 +538,7 @@ impl GraphBuilder {
         let node = create_custom_node(
             def.name.clone(),
             remap_queries(def.queries.clone()),
-            def.output.unwrap_or("type O {}".to_string()),
+            def.output.unwrap_or("{}".to_string()),
             def.node_type_name,
             def.output_tables.unwrap_or(vec![])
         );
@@ -553,7 +553,7 @@ impl GraphBuilder {
         let node = create_code_node(
             def.name.clone(),
             remap_queries(def.queries.clone()),
-            def.output.unwrap_or("type O {}".to_string()),
+            def.output.unwrap_or("{}".to_string()),
             SourceNodeType::Code("DENO".to_string(), def.code, def.is_template.unwrap_or(false)),
             def.output_tables.unwrap_or(vec![])
         );
@@ -568,7 +568,7 @@ impl GraphBuilder {
         let node = create_vector_memory_node(
             def.name.clone(),
             remap_queries(def.queries.clone()),
-            def.output.unwrap_or("type O {}".to_string()),
+            def.output.unwrap_or("{}".to_string()),
             def.action.unwrap_or("READ".to_string()),
             def.embedding_model.unwrap_or("TEXT_EMBEDDING_ADA_002".to_string()),
             def.template.unwrap_or("".to_string()),
@@ -670,7 +670,7 @@ impl NodeHandle {
     }
 
     fn get_output_type(&self) -> Vec<Vec<String>> {
-        self.indiv.output_path.clone()
+        self.indiv.output_paths.clone()
     }
 
     pub fn run_when(&mut self, graph_builder: &mut GraphBuilder, other_node: &NodeHandle) -> anyhow::Result<bool> {
@@ -694,7 +694,7 @@ impl NodeHandle {
 
     pub async fn query(&self, file_id: String, url: String, branch: u64, frame: u64) -> anyhow::Result<HashMap<String, SerializedValue>> {
         let name = &self.node.core.as_ref().unwrap().name;
-        let query = construct_query_from_output_type(&name, &name, &self.indiv.output_path).unwrap();
+        let query = construct_query_from_output_type(&name, &name, &self.indiv.output_paths).unwrap();
         let mut client = get_client(url).await?;
         let result = client.run_query(QueryAtFrame {
             id: file_id,

package/{package_python → tests/python}/test_chidori.py

@@ -16,13 +16,7 @@ async def test_simple_agent():
     )
     pn = await g.deno_code_node(
         name="CodeNode",
-        queries=["""
-            query Q {
-                InspirationalQuote {
-                  promptResult
-                }
-            }
-            """],
+        queries=["""SELECT promptResult FROM InspirationalQuote"""],
         code="""
             return {"output": "Here is your quote for "+ new Date() + {{InspirationalQuote.promptResult}} }
             """,

package/package_python/.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

package/package_python/.idea/misc.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
-</project>

package/package_python/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/package_python.iml" filepath="$PROJECT_DIR$/.idea/package_python.iml" />
-    </modules>
-  </component>
-</project>

package/package_python/.idea/package_python.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/package_python/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
-  </component>
-</project>

package/package_python/chidori.pyi

@@ -1,32 +0,0 @@
-from __future__ import annotations
-
-from typing import *
-
-class Chidori:
-    def start_server(self, file_path: Optional[str]) -> None: ...
-    def play(self, branch: int, frame: int) -> None: ...
-    def pause(self, frame: int) -> None: ...
-    def branch(self) -> None: ...
-    def query(self, query: str, branch: int, frame: int) -> None: ...
-    def list_branches(self) -> None: ...
-    def display_graph_structure(self) -> None: ...
-    def list_registered_graphs(self) -> None: ...
-    def list_input_proposals(self) -> None: ...
-    def list_change_events(self, callback: object) -> 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: ...