fix: docker entrypoint

Makefile

@@ -1,47 +1,3 @@
-NPI_CMD_ROOT = $(shell pwd)
-GIT_COMMIT = $(shell git log -1 --format='%h' | awk '{print $0}')
-DATE = $(shell date +%Y-%m-%d_%H:%M:%S%z)
-
-VERSION ?= ${GIT_COMMIT}
-IMAGE_TAG ?= ${VERSION}
-
-#os linux or darwin
-GOOS ?= darwin
-#arch amd64 or arm64
-GOARCH ?= amd64
-
-CMD_OUTPUT_DIR ?= ${NPI_CMD_ROOT}/bin
-
-LD_FLAGS = -X 'main.Version=${VERSION}'
-LD_FLAGS += -X 'main.GitCommit=${GIT_COMMIT}'
-LD_FLAGS += -X 'main.BuildDate=${DATE}'
-LD_FLAGS += -X 'main.Platform=${GOOS}/${GOARCH}'
-
-GO_BUILD = GOOS=$(GOOS) GOARCH=$(GOARCH) go build -C ${NPI_CMD_ROOT}/cli -trimpath
-DOCKER_PLATFORM ?= linux/arm64,linux/amd64
-
-build-npi:
-	$(GO_BUILD) -ldflags "${LD_FLAGS}"  -o ${CMD_OUTPUT_DIR}/npi ${NPI_CMD_ROOT}/cli
-
-release-npi-cli:
-	$(GO_BUILD) -ldflags "${LD_FLAGS}" -o ${CMD_OUTPUT_DIR}/cli/npi ${NPI_CMD_ROOT}/cli
-	zip -j ${CMD_OUTPUT_DIR}/npi-${VERSION}-${GOOS}-${GOARCH}.zip ${CMD_OUTPUT_DIR}/npi
-
-docker-build:
-	docker buildx build --platform ${DOCKER_PLATFORM} -t npiai/npi:${IMAGE_TAG} . --push
-
-docker-build-gateway:
-	docker buildx build --platform linux/amd64 -t npiai/gateway:latest -f build/gateway.Dockerfile proto/go --push
-
-docker-build-base:
-	docker buildx build --platform ${DOCKER_PLATFORM} -t npiai/base:3.10 -f build/base.Dockerfile build --push
-
-docker-build-local:
-	docker build -t npiai/npi:${IMAGE_TAG} .
-
-clean:
-	rm -rf bin
-
 release:
 	poetry publish --build -u __token__ -p ${PYPI_TOKEN}
 	rm -rf dist

build/Makefile

@@ -0,0 +1,47 @@
+NPI_CMD_ROOT = $(shell pwd)
+GIT_COMMIT = $(shell git log -1 --format='%h' | awk '{print $0}')
+DATE = $(shell date +%Y-%m-%d_%H:%M:%S%z)
+
+VERSION ?= ${GIT_COMMIT}
+IMAGE_TAG ?= ${VERSION}
+
+#os linux or darwin
+GOOS ?= darwin
+#arch amd64 or arm64
+GOARCH ?= amd64
+
+CMD_OUTPUT_DIR ?= ${NPI_CMD_ROOT}/bin
+
+LD_FLAGS = -X 'main.Version=${VERSION}'
+LD_FLAGS += -X 'main.GitCommit=${GIT_COMMIT}'
+LD_FLAGS += -X 'main.BuildDate=${DATE}'
+LD_FLAGS += -X 'main.Platform=${GOOS}/${GOARCH}'
+
+GO_BUILD = GOOS=$(GOOS) GOARCH=$(GOARCH) go build -C ${NPI_CMD_ROOT}/cli -trimpath
+DOCKER_PLATFORM ?= linux/arm64,linux/amd64
+
+build-npi:
+	$(GO_BUILD) -ldflags "${LD_FLAGS}"  -o ${CMD_OUTPUT_DIR}/npi ${NPI_CMD_ROOT}/cli
+
+release-npi-cli:
+	$(GO_BUILD) -ldflags "${LD_FLAGS}" -o ${CMD_OUTPUT_DIR}/cli/npi ${NPI_CMD_ROOT}/cli
+	zip -j ${CMD_OUTPUT_DIR}/npi-${VERSION}-${GOOS}-${GOARCH}.zip ${CMD_OUTPUT_DIR}/npi
+
+docker-build:
+	docker buildx build --platform ${DOCKER_PLATFORM} -t npiai/npi:${IMAGE_TAG} . --push
+
+docker-build-gateway:
+	docker buildx build --platform linux/amd64 -t npiai/gateway:latest -f build/gateway.Dockerfile proto/go --push
+
+docker-build-base:
+	docker buildx build --platform ${DOCKER_PLATFORM} -t npiai/base:3.10 -f build/base.Dockerfile build --push
+
+docker-build-local:
+	docker build -t npiai/npi:${IMAGE_TAG} .
+
+clean:
+	rm -rf bin
+
+release:
+	poetry publish --build -u __token__ -p ${PYPI_TOKEN}
+	rm -rf dist

npiai/app/github/__test__/close_issue.spec.py

@@ -1,7 +1,7 @@
 import asyncio
 
 from npiai import agent_wrapper
-from npiai import GitHub
+from npiai.app import GitHub
 
 
 async def main():

npiai/core/base.py

@@ -4,7 +4,7 @@
 
 import yaml
 from litellm.types.completion import ChatCompletionToolMessageParam
-from litellm.utils import ChatCompletionMessageToolCall
+from litellm.types.utils import ChatCompletionMessageToolCall
 
 from npiai.types import FunctionRegistration
 from npiai.utils import logger

npiai/pyproject.toml → pyproject.toml

@@ -11,7 +11,7 @@ openai = "^1.30.3"
 termcolor = "^2.4.0"
 loguru = "^0.7.2"
 twilio = "^9.1.0"
-litellm = "^1.38.10"
+litellm = "1.40.15"
 pydantic = "^2.7.3"
 simplegmail = "^4.1.1"
 markdownify = "^0.12.1"

server/reconcile/tool.go

@@ -8,6 +8,7 @@ import (
 	"github.com/npi-ai/npi/server/service"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
+	"time"
 )
 
 // state transition:
@@ -81,10 +82,20 @@ func (tc *toolReconciler) Start(ctx context.Context) error {
 }
 
 func (tc *toolReconciler) BuildingHandler(ctx context.Context, ws model.ToolInstance) error {
-	if err := tc.builderSvc.Build(ctx, ws.Metadata); err != nil {
+	imageURI, err := tc.builderSvc.Build(ctx, ws.Metadata)
+	if err != nil {
 		return err
 	}
-	return nil
+	// update tool instance
+	_, err = tc.coll.UpdateOne(ctx,
+		bson.M{"_id": ws.ID},
+		bson.M{
+			"$set": bson.M{
+				"image":      imageURI,
+				"updated_at": time.Now(),
+			},
+		})
+	return db.ConvertError(err)
 }
 
 func (tc *toolReconciler) DeployingHandler(ctx context.Context, ws model.ToolInstance) error {

server/scripts/entrypoint.py

@@ -0,0 +1,42 @@
+import os
+import sys
+import importlib
+import time
+
+
+def print_tool_spec():
+    # Add the directory containing the file to sys.path
+    module_dir, module_name = os.path.split('/npiai/tools/app.py')
+    module_name = os.path.splitext(module_name)[0]  # Remove the .py extension
+
+    if module_dir not in sys.path:
+        sys.path.append(module_dir)
+
+    # Now you can import the module using its name
+    module = importlib.import_module(module_name)
+    # Create an instance of the class
+    tool_class = getattr(module, 'GitHub')
+    instance = tool_class()
+    print(instance.export())
+
+
+async def main():
+    # Add the directory containing the file to sys.path
+    module_dir, module_name = os.path.split('app.py')
+    module_name = os.path.splitext(module_name)[0]  # Remove the .py extension
+
+    if module_dir not in sys.path:
+        sys.path.append(module_dir)
+
+    # Now you can import the module using its name
+    module = importlib.import_module(module_name)
+    # Create an instance of the class
+    tool_class = getattr(module, 'GitHub')
+    instance = tool_class()
+
+    async with instance as i:
+        # await i.wait() TODO add this method to BaseApp class
+        time.sleep(1000)
+
+if __name__ == '__main__':
+    print_tool_spec()