Merge pull request #193 from kbase/sdkdev

Use PyPi baseclient

Author: MrCreosote

pyproject.toml

@@ -7,6 +7,7 @@ requires-python = "==3.12.10"
 dependencies = [
     "jsonrpcbase>=0.2.0",
     "kbase-auth-client==0.1.1",
+    "kbase-sdk-baseclient==0.1.0",
     "requests>=2.32.3",
 ]
 

src/main/java/us/kbase/sdk/callback/CallbackServerManager.java

@@ -60,7 +60,8 @@ public class CallbackServerManager implements AutoCloseable {
 	 * @param workDirRoot the working directory for the callback server. This directory will
 	 * be mounted into the server. Any files outside of this directory will not be visible to
 	 * the server. The callback server will write output here.
-	 * @param kbaseBaseUrl the base URL for contacting kBase services, e.g. "https://ci.kbase.us"
+	 * @param kbaseBaseUrl the base URL for contacting kBase services,
+	 * e.g. "https://ci.kbase.us/services/"
 	 * @param token the user's KBase token for contacting KBase services.
 	 * @param prov initial provenance for the callback server.
 	 * @param setResultsGloballyWriteable if true, set all files in the workDirRoot/workdir and

src/main/java/us/kbase/sdk/compiler/TemplateBasedGenerator.java

@@ -1,7 +1,6 @@
 package us.kbase.sdk.compiler;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.Writer;
 import java.nio.file.Path;
@@ -185,30 +184,14 @@ private static void initPythonPackages(String relativePyPath, FileSaver output,
             }
         }
 
-        if (client) {
-            copyResourceFile(relativePyPath, output, "baseclient.py");
-        } else {
-            copyResourceFile("biokbase/log.py", output, "log.py");
-        }
-    }
-
-    private static void copyResourceFile(
-            final String relativePath,
-            final FileSaver output,
-            final String file)
-            throws IOException {
-        final Path filepath;
-        if (Paths.get(relativePath).getParent() == null) {
-            filepath = Paths.get(file);
-        } else {
-            filepath = Paths.get(relativePath).getParent()
-                    .resolve(file);
-        }
-        try (
-            final InputStream input = TemplateFormatter.getResource(file);
-            final Writer w = output.openWriter(filepath.toString())
-        ) {
-            IOUtils.copy(input, w);
+        if (!client) {
+            final Path filepath = Paths.get("biokbase/log.py");
+            try (
+                final InputStream input = TemplateFormatter.getResource("log.py");
+                final Writer w = output.openWriter(filepath.toString())
+            ) {
+                IOUtils.copy(input, w);
+            }
         }
     }
 

src/main/resources/us/kbase/sdk/templates/baseclient.py

@@ -38,6 +38,7 @@ ENV PATH=/sdk/bin:$PATH
 RUN pip install \
     requests==2.32.5 \
     kbase-auth-client==0.1.1 \
+    kbase-sdk-baseclient==0.1.0 \
     jsonrpcbase==0.2.0 \
     uwsgi==2.0.30 \
     pytest==8.4.2 \