working containerized

Signed-off-by: John <[email protected]>

Author: pdxjohnny

github_webhook_events/agi.py

@@ -6,7 +6,7 @@
 
 AGI_SOCK=/tmp/agi.sock go run agi_sshd.go
 
-ssh -NnT -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no -R /tmux.sock:$(echo $TMUX | sed -e 's/,.*//g') -R /input.sock:$(mktemp -d)/input.sock user@localhost
+export INPUT_SOCK="$(mktemp -d)/input.sock"; ssh -NnT -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no -R /tmux.sock:$(echo $TMUX | sed -e 's/,.*//g') -R "${INPUT_SOCK}:${INPUT_SOCK}" user@localhost
 
 
 gh auth refresh -h github.com -s admin:public_key
@@ -3293,6 +3293,12 @@ def make_argparse_parser(argv=None):
         default=None,
         type=str,
     )
+    parser.add_argument(
+        "--client-side-input-socket-path",
+        dest="client_side_input_socket_path",
+        default=None,
+        type=str,
+    )
     parser.add_argument(
         "--agi-name",
         dest="agi_name",
@@ -4128,11 +4134,13 @@ async def read_unix_socket_lines(path):
         await writer.wait_closed()
 
 
-async def pdb_action_stream(tg, user_name, agi_name, agents, threads, pane: Optional[libtmux.Pane] = None):
+async def pdb_action_stream(tg, user_name, agi_name, agents, threads, pane: Optional[libtmux.Pane] = None, input_socket_path: Optional[str] = None):
     # TODO Take ALICE_INPUT from args
+    alice_input_sock = input_socket_path
     if pane is not None:
         alice_input = pane.window.session.show_environment()[f"{agi_name.upper()}_INPUT"]
-        alice_input_sock = pane.window.session.show_environment()[f"{agi_name.upper()}_INPUT_SOCK"]
+        if alice_input_sock is None:
+            alice_input_sock = pane.window.session.show_environment()[f"{agi_name.upper()}_INPUT_SOCK"]
         alice_input_last_line = pane.window.session.show_environment()[f"{agi_name.upper()}_INPUT_LAST_LINE"]
 
     if pathlib.Path(alice_input_sock).is_socket():
@@ -4253,6 +4261,8 @@ async def main(
     openai_api_key: str = None,
     openai_base_url: Optional[str] = None,
     pane: Optional[libtmux.Pane] = None,
+    input_socket_path: Optional[str] = None,
+    client_side_input_socket_path: Optional[str] = None,
 ):
     if log is not None:
         # logging.basicConfig(level=log)
@@ -4296,6 +4306,7 @@ async def main(
             agents,
             threads,
             pane=pane,
+            input_socket_path=input_socket_path,
         )
 
         # Waiting Event Stream and Callbacks
@@ -4450,7 +4461,7 @@ async def user_input_action_stream_queue_iterator(queue):
                         # pane.send_keys(f'', enter=True)
 
                         pane.send_keys(f'export {agi_name.upper()}_INPUT="' + '${CALLER_PATH}/input.txt"', enter=True)
-                        pane.send_keys(f'export {agi_name.upper()}_INPUT_SOCK="' + '${CALLER_PATH}/input.sock"', enter=True)
+                        pane.send_keys(f'export {agi_name.upper()}_INPUT_SOCK="{client_side_input_socket_path}"', enter=True)
                         pane.send_keys(f'export {agi_name.upper()}_INPUT_LAST_LINE="' + '${CALLER_PATH}/input-last-line.txt"', enter=True)
 
                         # TODO
@@ -4702,7 +4713,7 @@ def a_shell_for_a_ghost_send_keys(pane, send_string, erase_after=None):
             time.sleep(0.01)
 
 
-async def tmux_test(*args, socket_path=None, input_socket_path=None, **kwargs):
+async def tmux_test(*args, socket_path=None, input_socket_path=None, client_side_input_socket_path: Optional[str] = None, **kwargs):
     pane = None
     tempdir = None
     possible_tempdir = tempdir
@@ -4792,7 +4803,7 @@ async def tmux_test(*args, socket_path=None, input_socket_path=None, **kwargs):
         session.set_environment(tempdir_env_var, tempdir)
 
         session.set_environment(f"{agi_name.upper()}_INPUT", str(pathlib.Path(tempdir, "input.txt")))
-        session.set_environment(f"{agi_name.upper()}_INPUT_SOCK", str(input_socket_path))
+        session.set_environment(f"{agi_name.upper()}_INPUT_SOCK", client_side_input_socket_path)
         session.set_environment(f"{agi_name.upper()}_INPUT_LAST_LINE", str(pathlib.Path(tempdir, "input-last-line.txt")))
 
         pane.send_keys(
@@ -4946,7 +4957,7 @@ async def tmux_test(*args, socket_path=None, input_socket_path=None, **kwargs):
             time.sleep(0.1)
 
         pane.send_keys(f"export {agi_name.upper()}_INPUT=" + str(pathlib.Path(tempdir, "input.txt")), enter=True)
-        pane.send_keys(f"export {agi_name.upper()}_INPUT_SOCK=" + str(input_socket_path), enter=True)
+        pane.send_keys(f'export {agi_name.upper()}_INPUT_SOCK="{client_side_input_socket_path}"', enter=True)
         pane.send_keys(f"export {agi_name.upper()}_INPUT_LAST_LINE=" + str(pathlib.Path(tempdir, "input-last-line.txt")), enter=True)
         pane.send_keys(f'rm -fv ${agi_name.upper()}_INPUT_SOCK', enter=True)
         pane.send_keys(f'ln -s ${agi_name.upper()}_INPUT_SOCK', enter=True)
@@ -4955,7 +4966,7 @@ async def tmux_test(*args, socket_path=None, input_socket_path=None, **kwargs):
 
         pane.send_keys(f'set +x', enter=True)
 
-        await main(*args, pane=pane, **kwargs)
+        await main(*args, pane=pane, input_socket_path=input_socket_path, client_side_input_socket_path=client_side_input_socket_path, **kwargs)
     finally:
         with contextlib.suppress(Exception):
             if pane is not None:
@@ -4977,7 +4988,7 @@ async def lifespan_logging(app):
 app = FastAPI(lifespan=lifespan_logging)
 
 
-def run_tmux_attach(socket_path, input_socket_path):
+def run_tmux_attach(socket_path, input_socket_path, client_side_input_socket_path):
     cmd = [
         sys.executable,
         "-u",
@@ -4986,6 +4997,8 @@ def run_tmux_attach(socket_path, input_socket_path):
         socket_path,
         "--input-socket-path",
         input_socket_path,
+        "--client-side-input-socket-path",
+        client_side_input_socket_path,
         "--agi-name",
         # TODO Something secure here, scitt URN and lookup for PS1?
         f"alice{str(uuid.uuid4()).split('-')[4]}",
@@ -5016,11 +5029,12 @@ async def connect_and_read(socket_path: str, sleep_time: float = 0.1):
 class RequestConnectTMUX(BaseModel):
     socket_tmux_path: str = Field(alias="tmux.sock")
     socket_input_path: str = Field(alias="input.sock")
+    socket_client_side_input_path: str = Field(alias="client-side-input.sock")
 
 
 @app.post("/connect/tmux")
 async def connect(request_connect_tmux: RequestConnectTMUX, background_tasks: BackgroundTasks):
-    background_tasks.add_task(run_tmux_attach, request_connect_tmux.socket_tmux_path, request_connect_tmux.socket_input_path)
+    background_tasks.add_task(run_tmux_attach, request_connect_tmux.socket_tmux_path, request_connect_tmux.socket_input_path, request_connect_tmux.socket_client_side_input_path)
     return {
         "connected": True,
     }

github_webhook_events/agi_sshd.Dockerfile

@@ -0,0 +1,54 @@
+# docker build --progress=plain -t alice-server -f agi_sshd.Dockerfile . && docker run --rm -ti -p 2222:2222 -e OPENAI_API_KEY=$(python -m keyring get $(git config user.email) api-key.platform.openai.com) alice-server
+FROM golang:1.24 as builder_golang_agi_sshd
+
+WORKDIR /usr/src/app
+
+# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY agi_sshd.go .
+
+RUN set -x \
+  && CGO_ENABLED=0 go build -tags netgo -o agi_sshd agi_sshd.go
+
+# Python server, add built golang server
+FROM registry.fedoraproject.org/fedora as client
+
+COPY ./entrypoint.sh /host/entrypoint.sh
+
+RUN set -x \
+  && export CALLER_PATH=/host \
+  && /host/entrypoint.sh
+
+ENTRYPOINT /host/entrypoint.sh
+
+FROM client as server
+
+RUN set -x \
+  && dnf install -y curl tmux socat
+
+# TODO Caching
+# RUN bash -xec "$(grep 'pip install' /host/agi.py | head -n 1)"
+RUN set -x \
+  && python -m pip install -U pip setuptools wheel snoop openai openai-agents keyring keyrings-alt libtmux psutil
+
+COPY server_motd /host/
+COPY openai_assistant_instructions.md /host/
+COPY agi.py /host/
+COPY util.sh /host/
+COPY entrypoint-server.sh /host/
+COPY entrypoint.sh /host/
+
+RUN set -x \
+  && export CALLER_PATH=/host \
+  && bash -xe /host/entrypoint.sh
+
+RUN set -x \
+  && mkdir -pv /var/run/alice-server/
+
+COPY --from=builder_golang_agi_sshd /usr/src/app/agi_sshd /usr/bin/agi_sshd
+
+# TODO Remove bash, sh and other shells
+
+ENTRYPOINT ["/host/entrypoint-server.sh"]

github_webhook_events/agi_sshd.go

@@ -19,6 +19,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 
 	"golang.org/x/crypto/ssh"
@@ -29,6 +30,7 @@ import (
 type forward struct {
 	listener  net.Listener
 	localPath string
+	rawPath   string
 }
 
 func main() {
@@ -126,7 +128,7 @@ func handleSSH(raw net.Conn, cfg *ssh.ServerConfig) {
 			}
 
 			mu.Lock()
-			forwards[base] = &forward{listener, localPath}
+			forwards[base] = &forward{listener, localPath, p.SocketPath}
 			count := len(forwards)
 			mu.Unlock()
 
@@ -210,6 +212,9 @@ func notifyAGI(ctx context.Context, mu *sync.Mutex, forwards map[string]*forward
 	data := make(map[string]string, len(forwards))
 	for base, f := range forwards {
 		data[base] = f.localPath
+		if strings.HasSuffix(f.rawPath, "input.sock") {
+			data["client-side-input.sock"] = f.rawPath
+		}
 	}
 	mu.Unlock()
 

github_webhook_events/entrypoint-server.sh

@@ -5,31 +5,12 @@ if [[ "x${CALLER_PATH}" = "x" ]]; then
 fi
 mkdir -p "${CALLER_PATH}"
 
-(
-  while test 1; do
-    for user in $(cat /var/run/alice-server/sshd.logs.txt 2>/dev/null | grep 'invalid user' | sed -e 's/.*invalid user //g' -e 's/ .*//g'); do
-      found=$(grep -E "^${user}:" /etc/passwd);
-      if [[ "x${found}" = "x" ]]; then
-        useradd "${user}" 1>/dev/null 2>&1;
-      fi;
-    done;
-    sleep 0.1;
-  done
-) &
-
 source "${CALLER_PATH}/util.sh"
-# tail -F "${CALLER_PATH}/policy_engine.logs.txt" 2>/dev/null &
-# NO_CELERY=1 python -u ${CALLER_PATH}/policy_engine.py api --bind 127.0.0.1:0 --workers 1 1>"${CALLER_PATH}/policy_engine.logs.txt" 2>&1 &
-# export POLICY_ENGINE_PORT=$(grep 'Listening at' "${CALLER_PATH}/policy_engine.logs.txt" | sed -e 's/.*://g' -e 's/ .*//g')
-# until [[ "x${POLICY_ENGINE_PORT}" != "x" ]]; do export POLICY_ENGINE_PORT=$(grep 'Listening at' "${CALLER_PATH}/policy_engine.logs.txt" | sed -e 's/.*://g' -e 's/ .*//g'); done
-# echo "${POLICY_ENGINE_PORT}" > "${CALLER_PATH}/policy_engine_port.txt"
+
+export AGI_SOCK="${CALLER_PATH}/agi.sock"
 
 tail -F "${CALLER_PATH}/agi.logs.txt" 2>/dev/null &
-(cd "${CALLER_PATH}" && python -m uvicorn "agi:app" --uds "${CALLER_PATH}/agi.sock" 1>"${CALLER_PATH}/agi.logs.txt" 2>&1 &)
-# python -u ${CALLER_PATH}/agi.py --listen-unix "${CALLER_PATH}/agi.sock" 1>"${CALLER_PATH}/agi.logs.txt" 2>&1 &
-# export POLICY_ENGINE_PORT=$(grep 'Listening at' "${CALLER_PATH}/policy_engine.logs.txt" | sed -e 's/.*://g' -e 's/ .*//g')
-# until [[ "x${POLICY_ENGINE_PORT}" != "x" ]]; do export POLICY_ENGINE_PORT=$(grep 'Listening at' "${CALLER_PATH}/policy_engine.logs.txt" | sed -e 's/.*://g' -e 's/ .*//g'); done
-# echo "${POLICY_ENGINE_PORT}" > "${CALLER_PATH}/policy_engine_port.txt"
+(cd "${CALLER_PATH}" && python -m uvicorn "agi:app" --uds "${AGI_SOCK}" 1>"${CALLER_PATH}/agi.logs.txt" 2>&1 &)
 
 mkdir -p /var/run/alice-server/
-/usr/sbin/sshd -D -E /var/run/alice-server/sshd.logs.txt -f /etc/ssh/sshd_config
+agi_sshd