Add addImportPath method (hmenyus#22)

uglide · web-flow · commit d4e68809d66e · 2022-08-22T22:14:35.000+02:00
Allow adding folders to import path to simplify deployment of
python dependencies.
diff --git a/index.js b/index.js
@@ -89,6 +89,11 @@ class Interpreter
     {
         return this.py.fixlink(filename);
     }
+
+    addImportPath(path)
+    {
+        return this.py.addImportPath(path);
+    }
 }
 
 let py = new Interpreter();
diff --git a/src/addon.cpp b/src/addon.cpp
@@ -217,11 +217,12 @@ namespace nodecallspython
                 DECLARE_NAPI_METHOD("callSync", callSync),
                 DECLARE_NAPI_METHOD("create", newclass),
                 DECLARE_NAPI_METHOD("createSync", newclassSync),
-                DECLARE_NAPI_METHOD("fixlink", fixlink)
+                DECLARE_NAPI_METHOD("fixlink", fixlink),
+                DECLARE_NAPI_METHOD("addImportPath", addImportPath)
             };
 
             napi_value cons;
-            CHECKNULL(napi_define_class(env, "PyInterpreter", NAPI_AUTO_LENGTH, create, nullptr, 7, properties, &cons));
+            CHECKNULL(napi_define_class(env, "PyInterpreter", NAPI_AUTO_LENGTH, create, nullptr, 8, properties, &cons));
 
             CHECKNULL(napi_create_reference(env, cons, 1, &constructor));
 
@@ -582,6 +583,50 @@ namespace nodecallspython
             return nullptr;
 #endif
         }
+
+        static napi_value addImportPath(napi_env env, napi_callback_info info)
+        {
+            napi_value jsthis;
+            size_t argc = 1;
+            napi_value args[1];
+            CHECKNULL(napi_get_cb_info(env, info, &argc, &args[0], &jsthis, nullptr));
+
+            if (argc != 1)
+            {
+                napi_throw_error(env, "args", "Must have 1 arguments");
+                return nullptr;
+            }
+
+            Python* obj;
+            CHECKNULL(napi_unwrap(env, jsthis, reinterpret_cast<void**>(&obj)));
+
+            napi_valuetype valuetype;
+            CHECKNULL(napi_typeof(env, args[0], &valuetype));
+
+            if (valuetype == napi_string)
+            {
+                auto path = convertString(env, args[0]);
+                auto& py = obj->getInterpreter();
+
+                std::string handler;
+                try
+                {
+                    GIL gil;
+                    py.addImportPath(path);
+                    return nullptr;
+                }
+                catch(const std::exception& e)
+                {
+                    napi_throw_error(env, "py", e.what());
+                }
+            }
+            else
+            {
+                napi_throw_error(env, "args", "Wrong type of arguments");
+            }
+
+            return nullptr;
+        }
     };
 
     napi_ref Python::constructor;
diff --git a/src/pyinterpreter.cpp b/src/pyinterpreter.cpp
@@ -440,3 +440,10 @@ void PyInterpreter::release(const std::string& handler)
 {
     m_objs.erase(handler);
 }
+
+void PyInterpreter::addImportPath(const std::string& path)
+{
+    auto sysPath = PySys_GetObject((char*)"path");
+    CPyObject dirName = PyUnicode_FromString(path.c_str());
+    PyList_Insert(sysPath, 0, *dirName);
+}
diff --git a/src/pyinterpreter.h b/src/pyinterpreter.h
@@ -48,5 +48,7 @@ namespace nodecallspython
         void release(const std::string& handler);
         
         CPyObject call(const std::string& handler, const std::string& func, CPyObject& args);
+
+        void addImportPath(const std::string& path);
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,11 @@ class Interpreter`
`89`	`89`	`{`
`90`	`90`	`return this.py.fixlink(filename);`
`91`	`91`	`}`
	`92`	`+`
	`93`	`+ addImportPath(path)`
	`94`	`+ {`
	`95`	`+ return this.py.addImportPath(path);`
	`96`	`+ }`
`92`	`97`	`}`
`93`	`98`
`94`	`99`	`let py = new Interpreter();`
Original file line number	Diff line number	Diff line change
`@@ -440,3 +440,10 @@ void PyInterpreter::release(const std::string& handler)`
`440`	`440`	`{`
`441`	`441`	`m_objs.erase(handler);`
`442`	`442`	`}`
	`443`	`+`
	`444`	`+void PyInterpreter::addImportPath(const std::string& path)`
	`445`	`+{`
	`446`	`+ auto sysPath = PySys_GetObject((char*)"path");`
	`447`	`+ CPyObject dirName = PyUnicode_FromString(path.c_str());`
	`448`	`+ PyList_Insert(sysPath, 0, *dirName);`
	`449`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,7 @@ namespace nodecallspython`
`48`	`48`	`void release(const std::string& handler);`
`49`	`49`
`50`	`50`	`CPyObject call(const std::string& handler, const std::string& func, CPyObject& args);`
	`51`	`+`
	`52`	`+ void addImportPath(const std::string& path);`
`51`	`53`	`};`
`52`	`54`	`}`