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

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: wowool-sdk-cpp
-Version: 3.6.0
-Summary: Wowool NLP Toolkit C++ SDK Python Bindings
+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
 Description-Content-Type: text/markdown

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.4}/pre_setup.py

@@ -147,7 +147,8 @@ def prep_build_setup(wow_stage: Path):
 
     platform_name = platform.system()
     if "Windows" == platform_name:
-        icu_files = ["icudt.lib", "icuuc.lib"]
+        icu_files = ["icudt77.dll", "icuuc77.dll"]
+        icu_lib_folder = stage_bin_folder
     elif "Darwin" == platform_name:
         icu_files = ["libicudata.dylib", "libicuuc.dylib"]
     else:
@@ -196,6 +197,7 @@ def prep_build_setup(wow_stage: Path):
 
     for fn in icu_files:
         target_fn = package_lib_folder / fn
+        logger.info(f"!!!!! COPY ICU {icu_lib_folder} {fn} --> {target_fn}")
         shutil.copy2(icu_lib_folder / fn, target_fn)
         # remove_rpath(target_fn)
         # set_rpath_origin(target_fn)

wowool_sdk_cpp-3.6.4/sdk_version.txt

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

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.4}/setup.py

@@ -332,10 +332,13 @@ class BuildExt(build_ext):
         ct = self.compiler.compiler_type
         opts = self.c_opts.get(ct, [])
         link_opts = self.l_opts.get(ct, [])
+        print(f"!!!!!!!!!!! Compiler type: {ct}, opts: {opts}, link_opts: {link_opts}")
         if ct == "unix":
             opts.append(cpp_flag(self.compiler))
             if has_flag(self.compiler, "-fvisibility=hidden"):
                 opts.append("-fvisibility=hidden")
+        elif ct == "msvc":
+            opts.append("/std:c++17")
 
         for ext in self.extensions:
             ext.define_macros = [("VERSION_INFO", '"{}"'.format(self.distribution.get_version()))]
@@ -404,6 +407,7 @@ def extension_modules():
         library_dirs = [str(Path(WOWOOL_STAGE, "lib")), get_config_var("LIBDEST")]
         libraries = ["wowool"]
         plugin_libraries = libraries
+        extra_compile_args.extend(["/DWIN32"])
     else:
         runtime_library_dirs = [runtime_library_path]
         extra_link_args = ["-Xlinker", "-rpath", "-Xlinker", get_origin_keyword(), "-static-libstdc++"]
@@ -486,11 +490,11 @@ install_requires = [
 version = open("version.txt").read().strip()
 
 
-results = setup(
+setup(
     name=package_name,
     version=version,
     author="Wowool",
-    description="Wowool NLP Toolkit C++ SDK Python Bindings",
+    description="Wowool NLP Toolkit C++ SDK Python Bindings, (use nlp-wowool-sdk instead if you want the Python SDK)",
     long_description=long_description,
     long_description_content_type="text/markdown",
     setup_requires=["pybind11"],

wowool_sdk_cpp-3.6.4/version.txt

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

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

@@ -42,7 +42,7 @@ 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" or value == "True";
+    return value == "true" || value == "True";
   }
   return default_value;
 }
@@ -117,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();
 }
@@ -158,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 {
@@ -189,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 {
@@ -209,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)
   // {
@@ -278,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,
@@ -458,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.0 → wowool_sdk_cpp-3.6.4}/wowool/package/lib/wowool_plugin.py

@@ -1,13 +1,13 @@
 from pathlib import Path
 import os
 import sys
+from platform import system
 
 if "WOWOOL_ROOT" in os.environ:
     WOWOOL_ROOT = os.environ["WOWOOL_ROOT"]
     expanded_wowool_root = Path(WOWOOL_ROOT).expanduser().resolve()
-    import platform
-
-    if platform.system() == "Windows":
+    
+    if system() == "Windows":
         WOWOOL_LIB = expanded_wowool_root / "bin"
         if str(WOWOOL_LIB) not in sys.path:
             sys.path.append(str(WOWOOL_LIB))
@@ -19,4 +19,7 @@ else:
 if str(WOWOOL_LIB) not in sys.path:
     sys.path.append(str(WOWOOL_LIB))
 
+if system() == "Windows":
+    os.add_dll_directory(str(WOWOOL_LIB))
+
 from _wowool_plugin import *  # noqa: F401, F403

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.4}/wowool/package/lib/wowool_sdk.py

@@ -1,14 +1,13 @@
 from pathlib import Path
 import os
 import sys
-
+from platform import system
 
 if "WOWOOL_ROOT" in os.environ:
     WOWOOL_ROOT = os.environ["WOWOOL_ROOT"]
     expanded_wowool_root = Path(WOWOOL_ROOT).expanduser().resolve()
-    import platform
-
-    if platform.system() == "Windows":
+    
+    if system() == "Windows":
         WOWOOL_LIB = expanded_wowool_root / "bin"
         if str(WOWOOL_LIB) not in sys.path:
             sys.path.append(str(WOWOOL_LIB))
@@ -20,6 +19,8 @@ else:
 if str(WOWOOL_LIB) not in sys.path:
     sys.path.append(str(WOWOOL_LIB))
 
+if system() == "Windows":
+    os.add_dll_directory(str(WOWOOL_LIB))
 
 from _wowool_sdk import *  # noqa
 from _wowool_sdk import (

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: wowool-sdk-cpp
-Version: 3.6.0
-Summary: Wowool NLP Toolkit C++ SDK Python Bindings
+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
 Description-Content-Type: text/markdown

wowool_sdk_cpp-3.6.0/sdk_version.txt

@@ -1 +0,0 @@
-3.2.0

wowool_sdk_cpp-3.6.0/version.txt

@@ -1 +0,0 @@
-3.6.0