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

…are-annotations' into release/535 # Conflicts: # docs/en/jsl/jsl_release_notes.md # johnsnowlabs/settings.py
JohnSnowLabs · May 17, 2024 · cd77f13 · cd77f13
2 parents 93d9995 + e93c038
commit cd77f13
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/johnsnowlabs/finance.py b/johnsnowlabs/finance.py
@@ -10,9 +10,6 @@
         from sparknlp_jsl.training import *
         from sparknlp_jsl.structured_deidentification import StructuredDeidentification
         from sparknlp_jsl.base import FeaturesAssembler
-        from sparknlp_jsl.annotator.windowed.windowed_sentence import (
-            WindowedSentenceModel,
-        )
         from sparknlp_jsl.finance.token_classification.ner.zero_shot_ner import ZeroShotNerModel
         from sparknlp_jsl.training_log_parser import ner_log_parser
 
@@ -112,6 +109,11 @@
             TextMatcherInternalModel as TextMatcherModel,
             RegexMatcherInternal as RegexMatcher,
             RegexMatcherInternalModel as RegexMatcherModel,
+            AssertionMerger,
+            LightDeIdentification,
+            WindowedSentenceModel,
+            MultiChunk2Doc,
+            FewShotAssertionClassifierModel
         )
 
         from sparknlp_jsl.modelTracer import ModelTracer

diff --git a/johnsnowlabs/legal.py b/johnsnowlabs/legal.py
@@ -8,9 +8,6 @@
     if try_import_lib("sparknlp_jsl") and try_import_lib("sparknlp"):
         from sparknlp_jsl.functions import *
         from sparknlp_jsl.training import *
-        from sparknlp_jsl.annotator.windowed.windowed_sentence import (
-            WindowedSentenceModel,
-        )
         from sparknlp_jsl.legal.token_classification.ner.zero_shot_ner import ZeroShotNerModel
         from sparknlp_jsl.training_log_parser import ner_log_parser
 
@@ -110,6 +107,11 @@
             TextMatcherInternalModel as TextMatcherModel,
             RegexMatcherInternal as RegexMatcher,
             RegexMatcherInternalModel as RegexMatcherModel,
+            AssertionMerger,
+            LightDeIdentification,
+            WindowedSentenceModel,
+            MultiChunk2Doc,
+            FewShotAssertionClassifierModel
         )
         from sparknlp_jsl.modelTracer import ModelTracer
 

diff --git a/johnsnowlabs/medical.py b/johnsnowlabs/medical.py
@@ -12,9 +12,6 @@
     if try_import_lib("sparknlp_jsl") and try_import_lib("sparknlp"):
         from sparknlp_jsl.functions import *
         from sparknlp_jsl.training import *
-        from sparknlp_jsl.annotator.windowed.windowed_sentence import (
-            WindowedSentenceModel,
-        )
         from sparknlp_jsl.annotator.ner.zero_shot_ner import ZeroShotNerModel
         from sparknlp_jsl.annotator import (
             GenericSVMClassifierApproach,
@@ -87,11 +84,18 @@
             IOBTagger,
             DocumentFiltererByClassifier,
             Flattener,
+            AssertionMerger,
+            LightDeIdentification,
+            WindowedSentenceModel,
+            MultiChunk2Doc,
+            FewShotAssertionClassifierModel
         )
         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.base import FeaturesAssembler