Sync

.github/workflows/build.yml

@@ -51,11 +51,7 @@ jobs:
 
       - name: Install and run ollama
         run: |
-          systemctl is-active ollama.service && sudo systemctl stop ollama.service
-          curl -fsSL https://ollama.com/install.sh | sh
-          ollama serve &
-          ollama pull phi3:mini
-          ollama pull nomic-embed-text:latest
+          ./scripts/ci.sh
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1

.github/workflows/release.yml

@@ -2,6 +2,7 @@ name: Build
 on:
   push:
     branches: [main]
+    tags: ["[0-9]+.[0-9]+.[0-9]+"]
 
 jobs:
   release:
@@ -18,5 +19,12 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Publish to crates.io
-        run: cargo publish --token ${{ secrets.CRATES_IO_API_TOKEN }}
+      - name: Publish `orch_response`
+        run: cargo publish -p orch_response --token ${{ secrets.CRATES_IO_API_TOKEN }}
+
+      - name: Publish `orch_response_derive`
+        run: cargo publish -p orch_response_derive --token ${{ secrets.CRATES_IO_API_TOKEN }}
+
+      - name: Publish `orch`
+        run: cargo publish -p orch --token ${{ secrets.CRATES_IO_API_TOKEN }}
+

CHANGELOG.md

@@ -1,10 +1,20 @@
-
 # Changelog
 
+# Version 0.0.4
+
+No functional changes.
+
+# Version 0.0.3
+
+- Added support for streaming responses
+- Added support for structured data generation
+- Added a convenience proc macro (`#[derive(OrchResponseOptions)]`) for generating structured data generation options
+- Added support for Open AI
+
 ## Version 0.0.2
 
 No functional changes.
 
 ## Version 0.0.1
 
-Initial release.
+Initial release.

README.md

@@ -1,12 +1,28 @@
 # orch
 
+![Crates.io Version](https://img.shields.io/crates/v/orch?link=https%3A%2F%2Fcrates.io%2Fcrates%2Forch)
+![Crates.io Total Downloads](https://img.shields.io/crates/d/orch?link=https%3A%2F%2Fcrates.io%2Fcrates%2Forch)
+
 `orch` is a library for building language model powered applications and agents for the Rust programming language.
 It was primarily built for usage in [magic-cli](https://github.com/guywaldman/magic-cli), but can be used in other contexts as well.
 
 > [!NOTE]
 >
 > If the project gains traction, this can be compiled as an addon to other languages such as Python or a standalone WebAssembly module.
 
+# Installation
+
+```shell
+cargo add orch
+```
+
+Alternatively, add `orch as a dependency to your `Cargo.toml` file:
+
+```toml
+[dependencies]
+orch = "0.0.4"
+```
+
 # Basic Usage
 
 ## Simple Text Generation

RELEASE.md

@@ -0,0 +1,7 @@
+# Release Process
+
+1. Update the versions in all package `Cargo.toml` files and version in the README.md file
+   > Alternatively, rename all versions that are not in [CHANGELOG.md](CHANGELOG.md) to the next version.
+1. Update the versions in the `README.md` file
+1. Update [CHANGELOG.md](CHANGELOG.md)
+1. Push the changes to the `main` branch with a tag (e.g., `0.0.4`)

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "orch"
-version = "0.0.3"
+version = "0.0.4"
 edition = "2021"
 license = "MIT"
 description = "Language model orchestration library"
@@ -9,8 +9,8 @@ repository = "https://github.com/guywaldman/orch"
 keywords = ["llm", "openai", "ollama", "rust"]
 
 [dependencies]
-orch_response = { path = "../response", version = "0.0.3" }
-orch_response_derive = { path = "../response_derive", version = "0.0.3" }
+orch_response = { path = "../response", version = "0.0.4" }
+orch_response_derive = { path = "../response_derive", version = "0.0.4" }
 async-gen = "0.2.3"
 dotenv = "0.15.0"
 dyn-clone = "1.0.17"

core/examples/structured_data_generation_basic.rs

@@ -2,7 +2,7 @@
 
 use orch::execution::*;
 use orch::lm::*;
-use orch_response_derive::*;
+use orch::response::*;
 
 #[derive(OrchResponseOptions)]
 pub enum CapitalCityExecutorResponseOptions {

core/examples/structured_data_generation_blog.rs

@@ -2,7 +2,7 @@
 
 use orch::execution::*;
 use orch::lm::*;
-use orch_response_derive::*;
+use orch::response::*;
 
 #[derive(OrchResponseOptions)]
 pub enum BlogPostReviewerResponseOption {

core/src/lib.rs

@@ -50,7 +50,7 @@
 //! ```no_run
 //! use orch::execution::*;
 //! use orch::lm::*;
-//! use orch_response_derive::*;
+//! use orch::response::*;
 //!
 //! #[derive(OrchResponseOptions)]
 //! pub enum CapitalCityExecutorResponseOptions {
@@ -122,3 +122,8 @@
 pub mod execution;
 pub mod lm;
 mod net;
+
+pub mod response {
+    pub use orch_response::*;
+    pub use orch_response_derive::*;
+}

response/Cargo.toml

@@ -1,7 +1,12 @@
 [package]
 name = "orch_response"
-version = "0.0.3"
+version = "0.0.4"
 edition = "2021"
+license = "MIT"
+description = "Models for orch Executor responses"
+homepage = "https://github.com/guywaldman/orch"
+repository = "https://github.com/guywaldman/orch"
+keywords = ["llm", "openai", "ollama", "rust"]
 
 [dependencies]
 serde = "1.0.204"

response_derive/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "orch_response_derive"
-version = "0.0.3"
+version = "0.0.4"
 edition = "2021"
 license = "MIT"
-description = "Utilities for working with orch Executor responses"
+description = "Derive macros for orch Executor responses"
 homepage = "https://github.com/guywaldman/orch"
 repository = "https://github.com/guywaldman/orch"
 keywords = ["llm", "openai", "ollama", "rust"]
@@ -12,7 +12,7 @@ keywords = ["llm", "openai", "ollama", "rust"]
 proc-macro = true
 
 [dependencies]
-orch_response = { path = "../response" }
+orch_response = { path = "../response", version = "0.0.4" }
 darling = "0.20.10"
 proc-macro2 = "1.0.86"
 quote = "1.0.36"

scripts/ci.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+for i in 1 2 3; do
+	systemctl is-active ollama.service && sudo systemctl stop ollama.service
+	curl -fsSL https://ollama.com/install.sh | sh
+	sleep 5
+	if systemctl is-active ollama.service; then
+		break
+	fi
+done
+
+ollama serve &
+ollama pull phi3:mini
+ollama pull nomic-embed-text:latest