Merge pull request #1 from shipclojure/exp/confert-to-core-async-flow

Convert voice-fn to core.async.flow

Author: ovistoica

.github/workflows/tests.yaml

@@ -34,15 +34,6 @@ jobs:
           # key: cljdeps-${{ hashFiles('build.boot') }}
           restore-keys: cljdeps-
 
-      - name: Setup Babashka
-        uses: turtlequeue/setup-babashka@v1.7.0
-        with:
-          babashka-version: 1.3.189
-
-      - name: Check bb runs
-        run: bb --version
-        working-directory: ./core
-
       - name: Run Clj Unit tests
-        run: bb test
+        run: clojure -M:test -m kaocha.runner :unit
         working-directory: ./core

TODO.org

@@ -63,6 +63,7 @@ CLOCK: [2025-01-08 Wed 08:29]--[2025-01-08 Wed 08:54] =>  0:25
 * TODO Add tools calls support :mvp:
 DEADLINE: <2025-01-17 Fri>
 :LOGBOOK:
+CLOCK: [2025-01-23 Thu 08:23]--[2025-01-23 Thu 08:48] =>  0:25
 CLOCK: [2025-01-20 Lun 07:26]--[2025-01-20 Lun 07:51] =>  0:25
 CLOCK: [2025-01-19 Dum 07:56]--[2025-01-19 Dum 08:21] =>  0:25
 CLOCK: [2025-01-18 Sat 06:36]--[2025-01-18 Sat 06:41] =>  0:05
@@ -102,3 +103,11 @@ CLOSED: [2025-01-20 Lun 07:43]
 #+end_src
 
 * TODO research [[https://github.com/phronmophobic/clj-media][clojure-media]] for dedicated ffmpeg support for media conversion
+
+* TODO add core.async.flow support
+:LOGBOOK:
+CLOCK: [2025-01-25 Sat 16:35]--[2025-01-25 Sat 17:00] =>  0:25
+CLOCK: [2025-01-25 Sat 15:18]--[2025-01-25 Sat 15:43] =>  0:25
+CLOCK: [2025-01-25 Sat 11:14]--[2025-01-25 Sat 11:39] =>  0:25
+CLOCK: [2025-01-25 Sat 09:50]--[2025-01-25 Sat 10:15] =>  0:25
+:END:

core/.clj-kondo/metosin/malli-types-clj/config.edn

@@ -3,7 +3,7 @@
         org.uncomplicate/clojure-sound {:mvn/version "0.3.0"}
         com.taoensso/telemere {:mvn/version "1.0.0-RC1"}
         metosin/malli {:mvn/version "0.17.0"}
-        org.clojure/core.async {:mvn/version "1.7.701"}
+        org.clojure/core.async {:git/sha "cfb53ac7e48dbcf197b700c62bdd429675fa77b2" :git/url "https://github.com/clojure/core.async"}
         metosin/jsonista {:mvn/version "0.3.8"}
         com.microsoft.onnxruntime/onnxruntime {:mvn/version "1.20.0"}
         com.microsoft.onnxruntime/onnxruntime_gpu {:mvn/version "1.20.0"}
@@ -36,6 +36,5 @@
                                ring/ring-jetty-adapter {:mvn/version "1.13.0"}
                                metosin/reitit {:mvn/version "0.7.2"}}
                   :extra-paths ["../examples/src"]}
-  :clj-kondo
-  {:replace-deps {clj-kondo/clj-kondo {:mvn/version "RELEASE"}}
-   :main-opts ["-m" "clj-kondo.main"]}}}
+  :clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "RELEASE"}}
+              :main-opts ["-m" "clj-kondo.main"]}}}

core/deps.edn

@@ -33,25 +33,17 @@
         (= frame-type :frame.control/interrupt-start)
         (= frame-type :frame.control/interrupt-stop))))
 
-(def BaseFrameSchema
-  [:map
-   [:frame/type :keyword]
-   [:frame/data :any]
-   [:frame/ts :int]])
-
 (defmacro defframe
   "Define a frame creator function and its predicate with schema validation.
    Usage: (defframe audio-input
                     \"Doc string\"
                     {:type :frame.audio/input-raw
                      :schema [:map [:data AudioData]])}"
-  [name docstring {:keys [type schema]}]
-  (let [frame-schema (if schema
-                       [:map
-                        [:frame/type [:= type]]
-                        [:frame/data schema]
-                        [:frame/ts :int]]
-                       BaseFrameSchema)
+  [name docstring {:keys [type schema] :or {schema :any}}]
+  (let [frame-schema [:map
+                      [:frame/type [:= type]]
+                      [:frame/data schema]
+                      [:frame/ts :any]]
         frame-schema-name (symbol (str name "-schema"))
         pred-name (symbol (str name "?"))]
     `(do
@@ -114,20 +106,27 @@
 
 (defframe system-stop
   "Frame sent when the pipeline stops"
-  {:type :frame.system/stop})
+  {:type :frame.system/stop
+   :schema :boolean})
 
 (defframe system-error
   "General error frame"
   {:type :frame.system/error})
 
+(defframe system-config-change
+  "Frame with configuration changes for the running pipeline"
+  {:type :frame.system/config-change
+   :schema schema/PartialConfigSchema})
+
 ;;
 ;; Audio Frames
 ;; Frames for handling raw audio data
 ;;
 
 (defframe audio-input-raw
   "Raw audio input frame from input transport"
-  {:type :frame.audio/input-raw})
+  {:type :frame.audio/input-raw
+   :schema schema/ByteArray})
 
 (defframe audio-output-raw
   "Raw audio output frame for playback through output transport"
@@ -201,11 +200,13 @@
 
 (defframe user-speech-start
   "User started speaking"
-  {:type :frame.user/speech-start})
+  {:type :frame.user/speech-start
+   :schema :boolean})
 
 (defframe user-speech-stop
   "User stopped speaking"
-  {:type :frame.user/speech-stop})
+  {:type :frame.user/speech-stop
+   :scheam :boolean})
 
 ;;
 ;; Control Frames
@@ -214,21 +215,29 @@
 
 (defframe control-bot-interrupt
   "Bot should be interrupted"
-  {:type :frame.control/bot-interrupt})
+  {:type :frame.control/bot-interrupt
+   :schema :boolean})
 
 (defframe control-interrupt-start
   "Start pipeline interruption"
-  {:type :frame.control/interrupt-start})
+  {:type :frame.control/interrupt-start
+   :schema :boolean})
 
 (defframe control-interrupt-stop
   "Stop pipeline interruption"
-  {:type :frame.control/interrupt-stop})
+  {:type :frame.control/interrupt-stop
+   :schema :boolean})
 
 ;;
 ;; Input/Output Text Frames
 ;; Frames for text processing
 ;;
 
+(defframe speak-frame
+  "Text frame meant for TTS processors to generate speech from the input"
+  {:type :frame.tts/speak
+   :schema :string})
+
 (defframe text-input
   "Text input frame for LLM processing"
   {:type :frame.text/input})