Merge remote-tracking branch 'origin/feature/540/addition-new-healthc…

…are-annotations' into release/540 # Conflicts: # docs/en/jsl/jsl_release_notes.md # johnsnowlabs/settings.py
JohnSnowLabs · Jul 12, 2024 · a4ae153 · a4ae153
2 parents 7b81080 + 9bbcca5
commit a4ae153
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 21 deletions.
diff --git a/docs/en/jsl/jsl_release_notes.md b/docs/en/jsl/jsl_release_notes.md
@@ -17,10 +17,10 @@ See [Github Releases](https://github.com/JohnSnowLabs/johnsnowlabs/releases) for
 
 
 
-## 5.3.6
+# 5.3.6
 Release date: 5-22-2024
 
-The John Snow Labs 5.3.6 Library released with the following pre-installed and recommended dependencies
+The John Snow Labs 5.3.5 Library released with the following pre-installed and recommended dependencies
 
 
 | Library                                                                                 | Version |
@@ -33,10 +33,7 @@ The John Snow Labs 5.3.6 Library released with the following pre-installed and r
 | [Spark-NLP-Display](https://sparknlp.org/docs/en/display)                               | `5.0`   |
 | [Spark-NLP](https://github.com/JohnSnowLabs/spark-nlp/releases/)                        | `5.3.2` |
 | [Pyspark](https://spark.apache.org/docs/latest/api/python/)                             | `3.4.0` |
-
-
-
-## 5.3.5
+# 5.3.5
 Release date: 5-11-2024
 
 The John Snow Labs 5.3.5 Library released with the following pre-installed and recommended dependencies
@@ -55,7 +52,7 @@ The John Snow Labs 5.3.5 Library released with the following pre-installed and r
 
 
 
-## 5.3.4
+# 5.3.4
 Release date: 4-12-2024
 
 The John Snow Labs 5.3.4 Library released with the following pre-installed and recommended dependencies
@@ -73,7 +70,7 @@ The John Snow Labs 5.3.4 Library released with the following pre-installed and r
 | [Pyspark](https://spark.apache.org/docs/latest/api/python/)                             | `3.4.0` |
 
 
-## 5.3.3
+# 5.3.3
 Release date: 4-5-2024
 
 The John Snow Labs 5.3.3 Library released with the following pre-installed and recommended dependencies
@@ -92,7 +89,7 @@ The John Snow Labs 5.3.3 Library released with the following pre-installed and r
 
 
 
-## 5.3.2
+# 5.3.2
 Release date: 3-13-2024
 
 The John Snow Labs 5.3.2 Library released with the following pre-installed and recommended dependencies
@@ -112,26 +109,26 @@ The John Snow Labs 5.3.2 Library released with the following pre-installed and r
 
 
 
-## 5.3.1
+# 5.3.1
 Release date: 3-12-2024
 
 The John Snow Labs 5.3.1 Library released with the following pre-installed and recommended dependencies
 
 
 | Library                                                                                 | Version |
 |-----------------------------------------------------------------------------------------|---------|
-| [Visual NLP](https://nlp.johnsnowlabs.com/docs/en/spark_ocr_versions/ocr_release_notes) | `5.3.0` |
-| [Enterprise NLP](https://nlp.johnsnowlabs.com/docs/en/licensed_annotators)              | `5.3.0` |
+| [Visual NLP](https://nlp.johnsnowlabs.com/docs/en/spark_ocr_versions/ocr_release_notes) | `5.1.2` |
+| [Enterprise NLP](https://nlp.johnsnowlabs.com/docs/en/licensed_annotators)              | `5.2.1` |
 | [Finance NLP](https://nlp.johnsnowlabs.com/docs/en/financial_release_notes)             | `1.X.X` |
 | [Legal NLP](https://nlp.johnsnowlabs.com/docs/en/legal_release_notes)                   | `1.X.X` |
-| [NLU](https://github.com/JohnSnowLabs/nlu/releases)                                     | `5.3.0` |
+| [NLU](https://github.com/JohnSnowLabs/nlu/releases)                                     | `5.1.4` |
 | [Spark-NLP-Display](https://sparknlp.org/docs/en/display)                               | `4.4`   |
 | [Spark-NLP](https://github.com/JohnSnowLabs/spark-nlp/releases/)                        | `5.3.1` |
 | [Pyspark](https://spark.apache.org/docs/latest/api/python/)                             | `3.4.0` |
 
 
 
-## 5.3.0
+# 5.3.0
 Release date: 3-8-2024
 
 The John Snow Labs 5.3.0 Library released with the following pre-installed and recommended dependencies
@@ -170,7 +167,7 @@ The John Snow Labs 5.2.8 Library released with the following pre-installed and r
 
 
 
-## 5.2.7
+# 5.2.7
 Release date: 2-15-2024
 
 The John Snow Labs 5.2.7 Library released with the following pre-installed and recommended dependencies

diff --git a/johnsnowlabs/finance.py b/johnsnowlabs/finance.py
@@ -113,7 +113,12 @@
             LightDeIdentification,
             WindowedSentenceModel,
             MultiChunk2Doc,
-            FewShotAssertionClassifierModel
+            FewShotAssertionClassifierModel,
+            FewShotAssertionClassifierApproach,
+            FewShotAssertionSentenceConverter,
+            VectorDBPostProcessor,
+            ContextSplitAssembler,
+            ContextualAssertion,
         )
 
         from sparknlp_jsl.modelTracer import ModelTracer

diff --git a/johnsnowlabs/legal.py b/johnsnowlabs/legal.py
@@ -111,7 +111,12 @@
             LightDeIdentification,
             WindowedSentenceModel,
             MultiChunk2Doc,
-            FewShotAssertionClassifierModel
+            FewShotAssertionClassifierModel,
+            FewShotAssertionClassifierApproach,
+            FewShotAssertionSentenceConverter,
+            VectorDBPostProcessor,
+            ContextSplitAssembler,
+            ContextualAssertion,
         )
         from sparknlp_jsl.modelTracer import ModelTracer
 

diff --git a/johnsnowlabs/medical.py b/johnsnowlabs/medical.py
@@ -88,14 +88,20 @@
             LightDeIdentification,
             WindowedSentenceModel,
             MultiChunk2Doc,
-            FewShotAssertionClassifierModel
+            FewShotAssertionClassifierModel,
+            FewShotAssertionClassifierApproach,
+            FewShotAssertionSentenceConverter,
+            VectorDBPostProcessor,
+            ContextSplitAssembler,
+            ContextualAssertion,
         )
         from sparknlp_jsl.structured_deidentification import StructuredDeidentification
         from sparknlp_jsl.modelTracer import ModelTracer
         from sparknlp_jsl import training_log_parser, Deid
         from sparknlp_jsl.training_log_parser import ner_log_parser
         from sparknlp_jsl.pipeline_output_parser import PipelineOutputParser
         from sparknlp_jsl.updateModels import UpdateModels
+        from sparknlp_jsl.llm import LLMLoader
 
         from sparknlp_jsl.base import FeaturesAssembler
 

diff --git a/johnsnowlabs/settings.py b/johnsnowlabs/settings.py
@@ -69,10 +69,7 @@
 creds_info_file = os.path.join(license_dir, "info.json")
 
 # databricks paths
-
 dbfs_home_dir = "dbfs:/johnsnowlabs"
-dbfs_license_path = f"{dbfs_home_dir}/license.json"
-dbfs_info_path = f"{dbfs_home_dir}/info.json"
 dbfs_java_dir = f"{dbfs_home_dir}/java_installs"
 dbfs_py_dir = f"{dbfs_home_dir}/py_installs"
 db_py_jobs_dir = f"{dbfs_home_dir}/py_jobs"