cleaned up

Author: behrica

python.edn python.edn.examplepython.edn renamed to python.edn.example

@@ -113,18 +113,8 @@ user> (py/py. np linspace 2 3 :num 10)
     (let [python-edn-opts (-> (try (slurp "python.edn")
                                    (catch java.io.FileNotFoundException _ "{}"))
                               clojure.edn/read-string)
-          _ (log/infof "Pre-initialize-fn %s" (some-> python-edn-opts :pre-initialize-fn))
-          _ (def python-edn-opts python-edn-opts)
+          _ (log/debugf "Pre-initialize-fn %s" (some-> python-edn-opts :pre-initialize-fn))
           _ (some-> python-edn-opts :pre-initialize-fn requiring-resolve (apply []))
-          _ (some-> python-edn-opts :pre-initialize-fn)
-          ;_ ( (requiring-resolve 'libpython-clj2.python.uv/sync-python-setup))
-
-          ;(require 'libpython-clj2.python.uv)
-
-          ;(requiring-resolve )
-
-          ;(-> 'libpython-clj2.python.uv/char-seq namespace symbol require)
-          ;(resolve 'libpython-clj2.python.uv/char-seq)
           options (merge python-edn-opts options)
           info (py-info/detect-startup-info options)
           _ (log/infof "Startup info %s" info)
@@ -832,15 +822,3 @@ user> c
      ~@(for [s symbols] `(def ~s ~s))))
 
 
-(comment
-  (require 'libpython-clj2.python)
-  (require 'libpython-clj2.python.uv)
-
-  (libpython-clj2.python/initialize!)
-  (libpython-clj2.python/run-simple-string "import sys; sys.path.append('.venv/Lib/site-packages')")
-  (libpython-clj2.python/run-simple-string "import sys; print(sys.path)")
-  (libpython-clj2.python/run-simple-string "import sys; print(sys.prefix)")
-  (libpython-clj2.python/run-simple-string "import sys; print(sys.base_prefix)")
-  (libpython-clj2.python/import-module "openai")
-  (libpython-clj2.python/import-module "langextract")
-  )

src/libpython_clj2/python.clj

@@ -3,9 +3,10 @@
    [clojure.edn :as edn]
    [clojure.java.process :as process]
    [clojure.string :as str]
-   [cheshire.core :as json]))
+   [cheshire.core :as json]
+   [clojure.java.process :as proc]))
 
-(defn write-pyproject-toml! [deps-edn]
+(defn- write-pyproject-toml! [deps-edn]
 
   (let [python-deps
         (:python-deps deps-edn)
@@ -33,7 +34,7 @@
     (spit "pyproject.toml"
           (str/join "\n" py-project-lines))))
 
-(defn char-seq
+(defn- char-seq
   [^java.io.Reader rdr]
   (let [chr (.read rdr)]
     (when (>= chr 0)
@@ -44,12 +45,8 @@
         (cons chr (lazy-seq (char-seq rdr)))))))
 
 
-(defn start-and-print! [process-args]
-  (let [args
-        (concat [{:env {"RENV_CONFIG_INSTALL_VERBOSE" "TRUE"}}]
-                process-args)
-        p
-        (apply process/start args)]
+(defn- start-and-print! [process-args]
+  (let [p(apply process/start process-args)]
 
     (with-open [in-rdr (java.io.InputStreamReader. (.getInputStream p))
                 err-rdr (java.io.InputStreamReader. (.getErrorStream p))]
@@ -60,7 +57,9 @@
       (dorun (char-seq err-rdr)))))
 
 
-(defn sync-python-setup! []
+(defn sync-python-setup! 
+  "Synchronize python venv at .venv with 'uv sync'."
+  []
   (println "Synchronize python venv at .venv with 'uv sync'. This might take a few minutes")
   (let [deps-edn
         (->