Merge pull request #59 from devchat-ai/improve-workflows-installation

Improve workflows installation

Author: pplam

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "tools"]
 	path = tools
 	url = https://github.com/devchat-ai/devchat-vscode-tools.git
+[submodule "workflows"]
+	path = workflows
+	url = https://gitlab.com/devchat-ai/workflows.git

.idea/vcs.xml

@@ -44,6 +44,11 @@ tasks.register<Copy>("copyTools") {
     into(layout.buildDirectory.dir("tmp/copyTools/tools"))
 }
 
+tasks.register<Copy>("copyWorkflows") {
+    from(layout.projectDirectory.dir("workflows")) { exclude(".git/**", ".gitignore") }
+    into(layout.buildDirectory.dir("tmp/copyWorkflows/workflows"))
+}
+
 tasks.register<Exec>("buildGUI") {
     commandLine("yarn", "idea")
     workingDir(layout.projectDirectory.dir("gui"))
@@ -53,6 +58,7 @@ sourceSets {
     main {
         resources {
             srcDir(layout.buildDirectory.dir("tmp/copyTools"))
+            srcDir(layout.buildDirectory.dir("tmp/copyWorkflows"))
         }
     }
 }
@@ -74,7 +80,7 @@ tasks {
     }
 
     processResources {
-        dependsOn("copyTools")
+        dependsOn("copyTools", "copyWorkflows")
     }
 
     publishPlugin {

build.gradle.kts

@@ -45,7 +45,7 @@ class PythonEnvManager(private val workDir: String) {
         Log.info("Mamba already installed at: " + dstFile.path)
     }
 
-    fun createEnv(name: String, version: String = "3.11.4"): PythonEnv {
+    fun createEnv(name: String, version: String = "3.11.4", retries: Int = 5): PythonEnv {
         Log.info("Python environment is creating.")
         val errPrefix = "Error occurred during Python environment creation:"
         val pyenv = PythonEnv(Paths.get(mambaWorkDir, "envs", name).toString())
@@ -64,23 +64,34 @@ class PythonEnvManager(private val workDir: String) {
             "--yes"
         )
         Log.info("Preparing to create python environment by: $command")
-        try {
-            ProcessBuilder(*command).start().also { process ->
-                process.inputStream.bufferedReader().forEachLine { Log.info("[Mamba installation] $it") }
-                val exitCode = process.waitFor()
-                if (exitCode != 0) throw RuntimeException(
-                    "Command execution failed with exit code: $exitCode"
+
+        var remainingRetries: Int = retries
+        while (remainingRetries-- > 0) {
+            try {
+                ProcessBuilder(*command).start().also { process ->
+                    process.inputStream.bufferedReader().forEachLine { Log.info("[Mamba installation] $it") }
+                    val exitCode = process.waitFor()
+                    if (exitCode == 0) {
+                        Log.info("Python is installed in: $pythonBinPath")
+                        return pyenv
+                    }
+                    Log.warn(
+                        "$errPrefix Command execution failed with exit code $exitCode, $remainingRetries retries left"
+                    )
+                }
+            } catch (e: IOException) {
+                e.printStackTrace()
+                Log.warn(
+                    "$errPrefix Exception occurred while executing the command: ${e.message}, $remainingRetries retries left"
+                )
+            } catch (e: InterruptedException) {
+                Thread.currentThread().interrupt()
+                Log.warn(
+                    "$errPrefix Command execution was interrupted: ${e.message}, $remainingRetries retries left"
                 )
             }
-        } catch (e: IOException) {
-            throw RuntimeException("$errPrefix Command execution failed with exception: " + e.message, e)
-        } catch (e: InterruptedException) {
-            Thread.currentThread().interrupt()
-            throw RuntimeException("$errPrefix Command execution was interrupted: " + e.message, e)
         }
-
-        Log.info("Python is installed in: $pythonBinPath")
-        return pyenv
+        throw RuntimeException("$errPrefix Maximum retries exceed")
     }
 }
 

src/main/kotlin/ai/devchat/cli/PythonEnvManager.kt

@@ -10,7 +10,7 @@ object PathUtils {
     var pythonForWorkflows: String = "python"
     val pythonPath: String = Paths.get(workPath, "site-packages").toString()
 
-    fun copyResourceDirToPath(resourceDir: String, outputPath: String) {
+    fun copyResourceDirToPath(resourceDir: String, outputPath: String): String {
         val uri = javaClass.getResource(resourceDir)!!.toURI()
         val path = if (uri.scheme == "jar") {
             val fileSystem = try {
@@ -46,5 +46,7 @@ object PathUtils {
                 return FileVisitResult.CONTINUE
             }
         })
+
+        return outputPath
     }
 }

src/main/kotlin/ai/devchat/common/PathUtils.kt

@@ -40,20 +40,33 @@ class DevChatSetupThread : Thread() {
             Paths.get(workDir, "site-packages").toString()
         )
 
-        PathUtils.pythonCommand = getSystemPython(minimalPythonVersion) ?: envManager.createEnv(
-            "devchat", defaultPythonVersion
-        ).pythonCommand
+        PathUtils.pythonCommand = getSystemPython(minimalPythonVersion) ?: (
+            if (OSInfo.isWindows) Paths.get(
+                PathUtils.copyResourceDirToPath(
+                    "/tools/python-3.11.6-embed-amd64",
+                    Paths.get(workDir, "python-win").toString()
+                ), "python.exe").toString()
+            else envManager.createEnv(
+                "devchat", defaultPythonVersion
+            ).pythonCommand
+        )
         DevChatConfig(Paths.get(workDir, "config.yml").toString()).writeDefaultConfig()
     }
 
     private fun setupWorkflows(envManager: PythonEnvManager) {
+        val workflowsDir = File(Paths.get(workDir, "workflows").toString())
+        if (!workflowsDir.exists()) workflowsDir.mkdirs()
+        PathUtils.copyResourceDirToPath(
+            "/workflows",
+            Paths.get(workflowsDir.path, "sys").toString()
+        )
         try {
             DevChatWrapper().run(mutableListOf("update-sys" to null))
         } catch (e: Exception) {
             Log.warn("Failed to update-sys.")
         }
         listOf("sys", "org", "usr")
-            .map { Paths.get(workDir, "workflows", it, "requirements.txt").toString() }
+            .map { Paths.get(workflowsDir.path, it, "requirements.txt").toString() }
             .firstOrNull { File(it).exists() }
             ?.let {
                 val workflowEnv = envManager.createEnv("devchat-commands", defaultPythonVersion)