Merge pull request #985 from CitrineInformatics/revert-shapley-generate

Revert "Merge pull request #983 from CitrineInformatics/feature/pne-6…

Author: anoto-moniz

src/citrine/__version__.py

@@ -1 +1 @@
-__version__ = "3.14.0"
+__version__ = "3.15.0"

src/citrine/resources/predictor.py

@@ -196,14 +196,6 @@ def rename(self,
         entity = self.session.put_resource(path, json, version=self._api_version)
         return self.build(entity)
 
-    def generate_feature_effects(self,
-                                 uid: Union[UUID, str],
-                                 *,
-                                 version: Union[int, str] = MOST_RECENT_VER) -> GraphPredictor:
-        path = self._construct_path(uid, version, "shapley/generate")
-        self.session.put_resource(path, {}, version=self._api_version)
-        return self.get(uid, version=version)
-
     def delete(self, uid: Union[UUID, str], *, version: Union[int, str] = MOST_RECENT_VER):
         """Predictor versions cannot be deleted at this time."""
         msg = "Predictor versions cannot be deleted. Use 'archive_version' instead."
@@ -586,26 +578,6 @@ def rename(self,
             uid, version=version, name=name, description=description
         )
 
-    def generate_feature_effects_async(self,
-                                       uid: Union[UUID, str],
-                                       *,
-                                       version: Union[int, str]) -> GraphPredictor:
-        """Begin generation of feature effects.
-
-        version can be any numerical version (which exists), "latest", or "most_recent". Although
-        note that this will fail if the predictor is not already trained.
-
-        Feature effects are automatically generated for all new predictors after a successful
-        training as of the end of 2024. This call allows either regenerating those values, or
-        generating them for older predictors.
-
-        This call just begins the process; generation usually takes a few minutes, but can take
-        much longer. As soon as the call completes, the old values will be inaccessible. To wait
-        for the generation to complete, and to retrieve the new values once they're ready, use
-        GraphPredictor.feature_effects.
-        """
-        return self._versions_collection.generate_feature_effects(uid, version=version)
-
     def delete(self, uid: Union[UUID, str]):
         """Predictors cannot be deleted at this time."""
         msg = "Predictors cannot be deleted. Use 'archive_version' or 'archive_root' instead."

tests/resources/test_predictor.py

@@ -21,8 +21,8 @@
     FakeSession
 )
 from tests.utils.factories import (
-    AsyncDefaultPredictorResponseFactory, AsyncDefaultPredictorResponseMetadataFactory,
-    FeatureEffectsResponseFactory, TableDataSourceDataFactory
+        AsyncDefaultPredictorResponseFactory, AsyncDefaultPredictorResponseMetadataFactory,
+        TableDataSourceDataFactory
 )
 
 
@@ -734,7 +734,6 @@ def test_rename_name_only(valid_graph_predictor_data):
     expected_payload = {"name": new_name, "description": None}
     assert session.calls == [FakeCall(method="PUT", path=f"{versions_path}/{pred_version}/rename", json=expected_payload)]
 
-
 def test_rename_description_only(valid_graph_predictor_data):
     pred_id = valid_graph_predictor_data["id"]
     pred_version = valid_graph_predictor_data["metadata"]["version"]
@@ -752,20 +751,3 @@ def test_rename_description_only(valid_graph_predictor_data):
     versions_path = _PredictorVersionCollection._path_template.format(project_id=pc.project_id, uid=pred_id)
     expected_payload = {"name": None, "description": new_description}
     assert session.calls == [FakeCall(method="PUT", path=f"{versions_path}/{pred_version}/rename", json=expected_payload)]
-
-
-def test_generate_shapley(valid_graph_predictor_data):
-    pred_id = valid_graph_predictor_data["id"]
-    pred_version = valid_graph_predictor_data["metadata"]["version"]
-    session = FakeSession()
-    pc = PredictorCollection(uuid.uuid4(), session)
-    
-    fe_response = FeatureEffectsResponseFactory(metadata__status="INPROGRESS", result=None)
-    session.set_responses(fe_response, valid_graph_predictor_data)
-
-    versions_path = _PredictorVersionCollection._path_template.format(project_id=pc.project_id, uid=pred_id)
-    pred = pc.generate_feature_effects_async(pred_id, version=pred_version)
-    assert session.calls == [
-        FakeCall(method="PUT", path=f"{versions_path}/{pred_version}/shapley/generate", json={}),
-        FakeCall(method="GET", path=f"{versions_path}/{pred_version}")
-    ]