wowool-sdk-cpp 3.6.3__tar.gz → 3.6.4__tar.gz

{wowool_sdk_cpp-3.6.3 → wowool_sdk_cpp-3.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wowool-sdk-cpp
-Version: 3.6.3
+Version: 3.6.4
 Summary: Wowool NLP Toolkit C++ SDK Python Bindings, (use nlp-wowool-sdk instead if you want the Python SDK)
 Author: Wowool
 Requires-Python: >=3.11

wowool_sdk_cpp-3.6.4/sdk_version.txt

@@ -0,0 +1 @@
+3.3.1

wowool_sdk_cpp-3.6.4/version.txt

@@ -0,0 +1 @@
+3.6.4

{wowool_sdk_cpp-3.6.3 → wowool_sdk_cpp-3.6.4}/wowool/native/core/wowool_sdk.cpp

@@ -38,15 +38,13 @@ namespace py = pybind11;
 std::mutex global_python_mutex;
 #define PYTHON_LOCK std::lock_guard<std::mutex> guard(global_python_mutex);
 
-bool get_environment_bool(std::string const &env_id, bool default_value)
-{
-	char const *value_ptr = std::getenv(env_id.c_str());
-	if (value_ptr)
-	{
-		std::string value(value_ptr);
-		return value == "true" || value == "True";
-	}
-	return default_value;
+bool get_environment_bool(std::string const &env_id, bool default_value) {
+  char const *value_ptr = std::getenv(env_id.c_str());
+  if (value_ptr) {
+    std::string value(value_ptr);
+    return value == "true" || value == "True";
+  }
+  return default_value;
 }
 
 bool lock_gil = get_environment_bool("WOWOOL_LOCK_GIL", false);
@@ -119,6 +117,18 @@ wowool::common::Options convert_py_2_api_options(py::dict const &kwargs) {
   return options;
 }
 
+py::object resolve_license_key_provider(py::dict &kwargs) {
+  py::object license_key = py::none();
+  if (kwargs.contains("license_key_provider")) {
+    py::module pysdk =
+        py::module::import("wowool.native.core.lic_key_provider");
+    auto decode_license_key_provider =
+        pysdk.attr("decode_license_key_provider");
+    license_key = decode_license_key_provider(kwargs["license_key_provider"]);
+  }
+  return license_key; // py::object
+}
+
 std::string convert_filterset(wowool::filter::Filter const &filterset) {
   return filterset.info();
 }
@@ -160,26 +170,10 @@ public:
 
   typedef wowool::engine::Engine type;
 
-  // using wowool::engine::Engine::Engine;
-
-  // engine_t(wowool::engine::Engine const &&base)
-  // 	: wowool::engine::Engine(std::move(base))
-  // {
-  // 	std::cout << "PLUGIN wowool::engine::Engine(wowool::engine::Engine const
-  // &&base)" << this << std::endl;
-  // }
-
-  // engine_t(wowool::engine::Engine const &&base, py::dict const &kwarg)
-  // 	: wowool::engine::Engine(tir::pywowool::convert_py_2_api_options(kwarg))
-  // {
-  // 	std::cout << "PLUGIN wowool::engine::Engine(wowool::engine::Engine const
-  // &&base, py::dict const &kwarg)" << this << std::endl;
-  // }
-
   // we need this one to be able to create multi_process objects.
-  engine_t(py::dict const &kwarg)
-      : wowool::engine::Engine(tir::pywowool::convert_py_2_api_options(kwarg)) {
-  }
+  engine_t(py::dict const &kwargs)
+      : wowool::engine::Engine(
+            tir::pywowool::convert_py_2_api_options(kwargs)) {}
 };
 
 class lid_t : public wowool::language_identifier::LanguageIdentifier {
@@ -191,14 +185,14 @@ public:
   lid_t(wowool::language_identifier::LanguageIdentifier const &&base)
       : wowool::language_identifier::LanguageIdentifier(std::move(base)) {}
 
-  lid_t(wowool::analyzer::Engine const &engine, py::dict const &kwarg)
+  lid_t(wowool::analyzer::Engine const &engine, py::dict const &kwargs)
       : wowool::language_identifier::LanguageIdentifier(
-            engine, tir::pywowool::convert_py_2_api_options(kwarg)) {}
+            engine, tir::pywowool::convert_py_2_api_options(kwargs)) {}
 
-  lid_t(py::dict const &kwarg)
+  lid_t(py::dict const &kwargs)
       : wowool::language_identifier::LanguageIdentifier(
             tir::pywowool::get_default_engine(global_shared_engine_options),
-            tir::pywowool::convert_py_2_api_options(kwarg)) {}
+            tir::pywowool::convert_py_2_api_options(kwargs)) {}
 };
 
 class domain_t : public wowool::domain::Domain {
@@ -211,17 +205,17 @@ public:
       : wowool::domain::Domain(std::move(base)) {}
 
   domain_t(wowool::analyzer::Engine const &engine,
-           std::string const domain_descriptor, py::dict const &kwarg)
-      : wowool::domain::Domain(engine, domain_descriptor,
-                               tir::pywowool::convert_py_2_api_options(kwarg)) {
-  }
+           std::string const domain_descriptor, py::dict const &kwargs)
+      : wowool::domain::Domain(
+            engine, domain_descriptor,
+            tir::pywowool::convert_py_2_api_options(kwargs)) {}
 
   // we need this one to be able to create multi_process objects.
-  domain_t(py::dict const &kwarg)
+  domain_t(py::dict const &kwargs)
       : wowool::domain::Domain(
             tir::pywowool::get_default_engine(global_shared_engine_options),
-            kwarg["name"].cast<std::string>(),
-            tir::pywowool::convert_py_2_api_options(kwarg)) {}
+            kwargs["name"].cast<std::string>(),
+            tir::pywowool::convert_py_2_api_options(kwargs)) {}
 
   // wowool::analyzer::Results process(wowool::analyzer::Results const document)
   // {
@@ -280,10 +274,10 @@ public:
   analyzer_t(wowool::analyzer::Analyzer const &&base)
       : wowool::analyzer::Analyzer(std::move(base)) {}
 
-  analyzer_t(wowool::analyzer::Engine const &engine, py::dict const &kwarg)
+  analyzer_t(wowool::analyzer::Engine const &engine, py::dict const &kwargs)
       : wowool::analyzer::Analyzer(
-            engine, tir::pywowool::convert_py_2_api_options(kwarg)),
-        _kwargs(kwarg) {}
+            engine, tir::pywowool::convert_py_2_api_options(kwargs)),
+        _kwargs(kwargs) {}
 
   std::string
   process_return_string(std::string const &document,
@@ -460,10 +454,16 @@ PYBIND11_MODULE(_wowool_sdk, m)
         })
         .def("__getstate__", [](wowool::engine::Engine const& self) {
             py::dict kwargs = tir::pywowool::convert_options_2_py(self.options);
+            kwargs.attr("pop")("license_key", py::none());
             return kwargs;
         })
         .def("__setstate__", [](py::object self, py::dict kwargs) {
-			// std::cout << "PLUGIN __setstate__ wowool::engine::Engine(py::dict const& kwargs)" << std::endl;
+            auto license_key = tir::pywowool::resolve_license_key_provider(kwargs);
+            if (!license_key.is_none()) {
+                std::string value = py::str(license_key);
+                if (value.length() > 0)
+                    kwargs["license_key"] = license_key;
+            }
             auto& p = self.cast<tir::pywowool::engine_t&>();
             new (&p) tir::pywowool::engine_t(kwargs);
         })

{wowool_sdk_cpp-3.6.3 → wowool_sdk_cpp-3.6.4}/wowool_sdk_cpp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wowool-sdk-cpp
-Version: 3.6.3
+Version: 3.6.4
 Summary: Wowool NLP Toolkit C++ SDK Python Bindings, (use nlp-wowool-sdk instead if you want the Python SDK)
 Author: Wowool
 Requires-Python: >=3.11

wowool_sdk_cpp-3.6.3/sdk_version.txt

@@ -1 +0,0 @@
-3.3.0

wowool_sdk_cpp-3.6.3/version.txt

@@ -1 +0,0 @@
-3.6.3