tarandm_analytics 1.0.0.dev2__tar.gz → 1.0.0.dev4__tar.gz

{tarandm_analytics-1.0.0.dev2 → tarandm_analytics-1.0.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tarandm_analytics
-Version: 1.0.0.dev2
+Version: 1.0.0.dev4
 Summary: Package links analytics in Python with TaranDM software.
 Author: Marek Teller
 Author-email: mteller@taran.ai

{tarandm_analytics-1.0.0.dev2 → tarandm_analytics-1.0.0.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tarandm_analytics"
-version = "1.0.0.dev2"
+version = "1.0.0.dev4"
 description = "Package links analytics in Python with TaranDM software."
 authors = ["Marek Teller <mteller@taran.ai>"]
 readme = "README.md"

{tarandm_analytics-1.0.0.dev2 → tarandm_analytics-1.0.0.dev4}/tarandm_analytics/predictive_models/builder.py

@@ -687,7 +687,7 @@ class PredictiveModelBuilder:
             )
 
             # Detect attributes if not provided
-            if request_data.predictors is None or len(request_data.predictors) == 0:
+            if request_data.model_type != PredictiveModelType.PMML and len(request_data.predictors) == 0:
                 request_data.predictors = self.automated_attribute_detection(
                     model=predictive_model,
                     transformations=request_data.attribute_transformation,
@@ -719,7 +719,7 @@ class PredictiveModelBuilder:
             if request_data.model_type == PredictiveModelType.PMML:
                 extended_model_dict = {
                     "external_model": serialized_model,
-                    "attributes": serialized_model["feature_names"],
+                    "attributes": request_data.predictors,
                     "predictive_model_type": request_data.model_type,
                     "target": request_data.label_name,
                 }

{tarandm_analytics-1.0.0.dev2 → tarandm_analytics-1.0.0.dev4}/tarandm_analytics/predictive_models/extended_predictive_model.py

@@ -147,7 +147,9 @@ class ExtendedPredictiveModel(AbstractExtendedPredictiveModel):
     def apply_attribute_transformation(
         self, transformation: AttributeTransformation, attribute_value: Union[int, float]
     ) -> Optional[Union[int, float]]:
-        raise NotImplementedError()  # Implemented only in core because of QueryEvaluator
+        raise NotImplementedError(
+            "Applying transformations is not supported in tarandm-analytics"
+        )  # Implemented only in core because of QueryEvaluator
 
     def prepare_all_preprocessed_attributes(self, attribute_values: Dict[str, Any]) -> Dict[str, Any]:  # noqa: C901
         """

{tarandm_analytics-1.0.0.dev2 → tarandm_analytics-1.0.0.dev4}/tarandm_analytics/predictive_models/pmml_model.py

@@ -34,7 +34,9 @@ class ModelPMML(AbstractPredictiveModel):
         from sklearn_pmml_model.ensemble import PMMLForestClassifier
         from sklearn_pmml_model.ensemble.gb import PMMLGradientBoostingClassifier
 
-        tree = ET.parse(StringIO(self.pmml_model))  # nosec
+        model_readable: StringIO | TextIOWrapper[BytesIO] = StringIO(self.pmml_model)
+
+        tree = ET.parse(model_readable)  # nosec
         root = tree.getroot()
 
         model_cls = None
@@ -57,7 +59,8 @@ class ModelPMML(AbstractPredictiveModel):
 
                     new_tree = BytesIO()
                     tree.write(new_tree)
-                    self.pmml_model = TextIOWrapper(new_tree, encoding="US-ASCII").read()
+                    model_readable = TextIOWrapper(new_tree, encoding="US-ASCII")
+                    self.pmml_model = model_readable.read()
 
                     break
                 elif root_attributes["algorithmName"] == "XGBoost (GBTree)":
@@ -66,7 +69,8 @@ class ModelPMML(AbstractPredictiveModel):
         if model_cls is None:
             raise ValueError("Unable to load pmml model.")
 
-        self.model = model_cls(pmml=StringIO(self.pmml_model))
+        model_readable.seek(0)
+        self.model = model_cls(pmml=model_readable)
         self.feature_names = self._get_feature_names()
 
         return self