docker things + extras

Author: ryrobes

.github/workflows/docker-publish.yml

@@ -0,0 +1,35 @@
+name: Docker Publish
+
+on:
+  push:
+    branches: [ main ]
+  release:
+    types: [ published ]
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        push: true
+        tags: |
+          ghcr.io/${{ github.repository }}:latest
+          ghcr.io/${{ github.repository }}:${{ github.sha }}
+

.gitignore

@@ -55,3 +55,5 @@ backend/defs/secrets.edn
 *-lock.json
 *.jar
 !backend/extras/rabbit-kit-outliers/rabbit-kit-outliers.jar
+/rvbbit-*
+.zprint*

.zprintrc

@@ -0,0 +1,52 @@
+##FROM openjdk:17-jre-slim
+FROM eclipse-temurin:17-jre-jammy
+
+# Install additional packages
+RUN apt-get update && apt-get install -y \
+    curl \
+    wget \
+    exiftool \
+    npm \
+    nodejs \
+    imagemagick \
+    golang-go \
+    procps \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+COPY backend/rvbbit.jar .
+COPY backend/defs ./defs
+COPY backend/connections ./connections
+COPY backend/assets ./assets
+COPY backend/resources ./resources
+COPY backend/data ./data
+RUN mkdir ./db
+COPY backend/flows ./flows
+COPY backend/extras ./extras
+COPY backend/screens ./screens
+COPY backend/user.clj ./user.clj
+
+RUN  rm -rf ./assets/data-exports \
+    && rm -rf ./data/atoms \
+    && rm -rf ./defs/backup \
+    && rm -rf ./extras/node-colorthief/node_modules \
+    && rm -f ./extras/node-colorthief/package-lock.json  
+
+RUN mkdir ./data/atoms
+RUN mkdir ./assets/data-exports
+RUN mkdir ./shell-root
+
+# # Specify the command to run your application
+# CMD ["java", "-jar", "rvbbit.jar"]
+
+# Create a startup script
+RUN echo '#!/bin/sh' > /start.sh && \
+    echo 'echo "Running additional startup commands..."' >> /start.sh && \
+    echo 'go install github.com/danielmiessler/fabric@latest' >> /start.sh && \
+    echo 'cd extras/node-colorthief ; npm install ; cd ../..' >> /start.sh && \
+    echo 'echo "Starting RVBBIT..."' >> /start.sh && \
+    echo 'exec java -jar rvbbit.jar' >> /start.sh && \
+    chmod +x /start.sh
+
+# Use the startup script as the entry point
+ENTRYPOINT ["/start.sh"]

.zprintrc2

@@ -275,3 +275,4 @@ Besides the built-in runners of SQL queries and Views (UI) - the combination of
 - Several features I had previously tweeted about and are 80% done (mostly working), but were pulled to make my (self-imposed) deadline, will def surface them discussion for priorities as well
 
 
+Copyright © 2024 Ryan Robitaille

Dockerfile

@@ -33,7 +33,7 @@
                      :modes [:rowset]
                      :hop-bar? false
                      :ext ".edn"
-                     :icon "images/sql.png"} ;; basic clover-sql query runner
+                     :icon "images/sql.png "} ;; basic clover-sql query runner
 
            :views   {:default []
                      :modes [:clover :edn :data]

README.md

@@ -810,6 +810,31 @@
      :types {:x :any, :out :any},
      :expandable? true,
      :drag-meta {:type :open-fn}}}},
+  :open-fn-4
+  {:y 1125,
+   :fn (fn [x] x),
+   :w 150,
+   :raw-fn (fn [x] (str "Bearer " :settings/openai-api-key)),
+   :right-click? true,
+   :icon "zmdi-functions",
+   :types nil,
+   :z 0,
+   :ports {:in {:x :any}, :out {:out :any}},
+   :inputs nil,
+   :h 60,
+   :x 1675,
+   :data
+   {:flow-item
+    {:category ":rabbit-base",
+     :fn (fn [x] x),
+     :name ":open-fn",
+     :raw-fn (fn [x] x),
+     :type :open-fn,
+     :icon "zmdi-functions",
+     :types {:x :any, :out :any},
+     :inputs [:x],
+     :expandable? true,
+     :drag-meta {:type :open-fn}}}},
   :relative-url-path-for-png-version
   {:y 2825,
    :fn (fn [x] (get-in x [10 0 2])),
@@ -871,16 +896,19 @@
    :description ["Request map for the HTTP call. Headers, Method, URL, and the call body map."],
    :w 175,
    :right-click? true,
+   :types nil,
    :z 0,
-   :ports {:in {:req-body* :any}, :out {:headers :map, :method :keyword, :url :string, :body :map, :* :map}},
+   :ports
+   {:in {:apikey* :any, :req-body* :any},
+    :out {:out {:headers :map, :method :keyword, :url :string, :body :keyword, :* :map}}},
+   :inputs nil,
    :h 60,
    :x 1850,
    :data
    {:drag-meta {:type :open-block},
     :flow-item {:expandable? true, :meta {}},
     :user-input
-    {:headers
-     {"Authorization" "Bearer WAT!", "Content-Type" "application/json"},
+    {:headers {"Authorization" :apikey*, "Content-Type" "application/json"},
      :method :post,
      :url "https://api.openai.com/v1/images/generations",
      :body :req-body*}}},
@@ -1016,7 +1044,7 @@
     {:expandable? true,
      :meta {:* {:scrubber {:message "OpenAI image gen style selector - DALLE3", :values ["vivid" "natural"]}}}},
     :user-input "vivid"}}},
- :zoom [154.5 -248.51 0.445],
+ :zoom [-1087.26 -804.94 1.25],
  :opts {:close-on-done? true, :retry-on-error? true, :timeout 120000, :retries 404, :overrides {:style-param "vivid"}},
  :flow-id "openai-image-gen-ladder",
  :flowmaps-connections
@@ -1067,4 +1095,6 @@
   [:open-fn-2 :shell-command-2/command]
   [:shell-command-2 :abs-file-base-path/x]
   [:abs-file-base-path :generate-file-path/base-dir]
-  [:abs-file-base-path :create-png-path/base-dir]]}
+  [:abs-file-base-path :create-png-path/base-dir]
+  [:size-param :open-fn-4/x]
+  [:open-fn-4 :http-req-map/apikey*]]}

backend/defs/config.edn

@@ -39,7 +39,7 @@
                        [org.clojure/math.combinatorics "0.1.6"]
                        ;[hikari-cp "3.0.1"] ;; https://github.com/tomekw/hikari-cp
                        [hikari-cp "3.1.0"] ;; https://github.com/tomekw/hikari-cp
-                       [net.clojars.wkok/openai-clojure "0.11.1"]
+                      ;;  [net.clojars.wkok/openai-clojure "0.11.1"]
                        ;[clj-http "3.12.3"]
                        [clj-http "3.13.0"]
                        [cheshire "5.11.0"]