Release/501 (#492)

* [BUMP] Version to 4.4.4 * [DOCS] Update release notes * [BUMP] Bump Enterprise Version and Update Docs * [FEATURE] Added create_jsl_home_if_missing to `nlp.start()` * [FEATURE] Dynamic Wheel/Tar resolution for Spark NLP * [REFACTOR] cleanup print * [FEATURE] SKIP_py4j_DISABLE env var * [FEATURE] skip jsl_home_setup * [FIX] bug when parsing version from secrets that have the PR pattern * [BUMP] Enterprise NLP to 4.4.2, OCR to 4.4.1 * [DOCS] for 446 release * [BUMP] jsl-lib version * [FEATURE] bump jsl-lib version and dependencies and add new annotators and fix bad import * [BUMP] enterprise nlp, visual and NLU * NLU release notes * Add AverageEmbeddings and Doc2ChunkInternal to finance/legal/medical modules * docps update * [FEATURE] Support for `JOHNSNOWLABS_LICENSE_JSON` as single env variable to provide credentials * [REFACTOR] broken tests * [REFACTOR] broken tests * [BUMP] versions * [DOC] new nlu and jsl release * add Chunk2Token, ExtractiveSummarization to fin/leg/med * bump OCR and medical * update docs * bump jsl lib version and spark nlp * docs update * FEATURE MYJSL-369: Use compatabile secrets to install (#367) * FEATURE MYJSL-369: Use compatabile secrets to install * FEATURE MYJSL-369: Refactor code * FEATURE MYJSL-369: Add tests to cover functionality * add missing ChunkFiltererApproach, version bump and docs update * [HOTFIX] fixed pydantic version * update release notes * fix setup.py * bump versions to 5.0.0 and add ZeroClassifier Approach/Model to medical module and update docs * bump NLP/Enterprise version to 5.0.1, OCR to 4.4.4 * rename m1 to apple_silicon * release notes * download OCR jar in nlp.start() if missing and visual=True --------- Co-authored-by: Kshitiz <kshitiz.shakya22@gmail.com>
JohnSnowLabs · Aug 2, 2023 · 65e0b63 · 65e0b63
1 parent 1884211
commit 65e0b63
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 9 deletions.
diff --git a/docs/en/jsl/install_advanced.md b/docs/en/jsl/install_advanced.md
@@ -149,7 +149,7 @@ Use the following parameters to configure **what should** be installed.
 | `include_dependencies` | Defaults to `True` which installs all depeendencies. If set to `False` pip will be executed with the `--no-deps` argument under the hood.                                                                            |
 | `product`              | Specify product to install. By default installs everything you have access to.                                                                                                                                       |
 | `only_download_jars`   | By default all libraries are installed to the current environment via pip. Set to False to disable installing Python dependencies and **only download jars** to the John Snow Labs home directory.                     |
-| `hardware_target`     | Specify hardware install type, either `cpu`, `gpu`, `m1`, or `aarch` . Defaults to `cpu`. If you have a GPU and want to leverage CUDA, set `gpu`. If you are an Apple M1 or Arch user choose the corresponding types. |
+| `hardware_target`     | Specify hardware install type, either `cpu`, `gpu`, `apple_silicon`, or `aarch` . Defaults to `cpu`. If you have a GPU and want to leverage CUDA, set `gpu`. If you are an Apple M1 or Arch user choose the corresponding types. |
 | `py_install_type`      | Specify Python installation type to use, either `tar.gz` or `whl`, defaults to whl.                                                                                                                                   |
 | `refresh_install`      | Delete any cached files before installing by removing John Snow Labs home folder. **This will delete your locally cached licenses**.                                                                                  |
 

diff --git a/docs/en/jsl/jsl_release_notes.md b/docs/en/jsl/jsl_release_notes.md
@@ -16,6 +16,26 @@ See [Github Releases](https://github.com/JohnSnowLabs/johnsnowlabs/releases) for
 
 
 
+## 5.0.1
+Release date: 12-8-2023
+
+The John Snow Labs 5.0.0 Library released with the following pre-installed and recommended dependencies
+
+
+| Library                                                                     | Version |
+|-----------------------------------------------------------------------------|---------|
+| [Visual NLP](https://nlp.johnsnowlabs.com/docs/en/jsl/ocr_release_notes)        | `4.4.4` |
+| [Enterprise NLP](https://nlp.johnsnowlabs.com/docs/en/jsl/licensed_annotators)  | `5.0.1` |
+| [Finance NLP](https://nlp.johnsnowlabs.com/docs/en/jsl/financial_release_notes) | `1.X.X` |
+| [Legal NLP](https://nlp.johnsnowlabs.com/docs/en/jsl/legal_release_notes)       | `1.X.X` |
+| [NLU](https://github.com/JohnSnowLabs/nlu/releases)                         | `4.2.2` |
+| [Spark-NLP-Display](https://nlp.johnsnowlabs.com/docs/en/jsl/display)           | `4.4`   |
+| [Spark-NLP](https://github.com/JohnSnowLabs/spark-nlp/releases/)            | `5.0.1` |
+| [Pyspark](https://spark.apache.org/docs/latest/api/python/)                 | `3.1.2` |
+
+
+
+
 ## 5.0.0
 Release date: 13-4-2023
 

diff --git a/johnsnowlabs/auto_install/lib_resolvers/nlp_installer.py b/johnsnowlabs/auto_install/lib_resolvers/nlp_installer.py
@@ -33,7 +33,7 @@ class NlpLibResolver(Py4JJslLibDependencyResolverABC, metaclass=ABCMeta):
                 dependency_version=lib_version,
             ),
             JvmHardwareTarget.m1: UrlDependency(
-                url="https://s3.amazonaws.com/auxdata.johnsnowlabs.com/public/jars/spark-nlp-m1-assembly-{lib_version}.jar",
+                url="https://s3.amazonaws.com/auxdata.johnsnowlabs.com/public/jars/spark-nlp-silicon-assembly-{lib_version}.jar",
                 dependency_type=JvmHardwareTarget.m1,
                 spark_version=SparkVersion.spark3xx,
                 product_name=product_name,

diff --git a/johnsnowlabs/settings.py b/johnsnowlabs/settings.py
@@ -10,20 +10,21 @@
 # These versions are used for auto-installs and version  checks
 
 
-raw_version_jsl_lib = "5.0.0"
-raw_version_nlp = "5.0.0"
+raw_version_jsl_lib = "5.0.1"
+raw_version_nlp = "5.0.1"
 
 
 raw_version_nlu = "4.2.2"
 
 raw_version_pyspark = "3.1.2"
 raw_version_nlp_display = "4.1"
 
-raw_version_medical = "5.0.0"
-raw_version_secret_medical = "5.0.0"
+raw_version_medical = "5.0.1"
+raw_version_secret_medical = "5.0.1"
+
+raw_version_secret_ocr = "4.4.4"
+raw_version_ocr = "4.4.4"
 
-raw_version_secret_ocr = "4.4.3"
-raw_version_ocr = "4.4.3"
 raw_version_pydantic = "1.10.11"
 
 pypi_page = "https://pypi.org/project/johnsnowlabs"

diff --git a/johnsnowlabs/utils/enums.py b/johnsnowlabs/utils/enums.py
@@ -22,7 +22,7 @@ class DatabricksClusterStates(BaseEnum):
 class JvmHardwareTarget(BaseEnum):
     gpu = "gpu"
     cpu = "cpu"
-    m1 = "m1"
+    m1 = "apple_silicon"
     aarch = "aarch"
 
     @classmethod

diff --git a/johnsnowlabs/utils/sparksession_utils.py b/johnsnowlabs/utils/sparksession_utils.py
@@ -94,6 +94,7 @@ def start(
 
     # Get all Local Jar Paths, downloads them if missing
     suite = get_install_suite_from_jsl_home(
+        visual=visual,
         create_jsl_home_if_missing=create_jsl_home_if_missing,
         only_jars=True,
         jvm_hardware_target=hardware_target,