Merge pull request #243 from AI-SDC/development

merge dev into main

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
 
   # Autoremoves unused imports
   - repo: https://github.com/hadialqattan/pycln
-    rev: "v2.2.2"
+    rev: "v2.3.0"
     hooks:
       - id: pycln
         stages: [manual]

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Version 1.1.1 (Oct 19, 2023)
+
+Changes:
+*   Update notebook example paths ([#237](https://github.com/AI-SDC/AI-SDC/pull/237))
+*   Fix AdaBoostClassifier structural attack ([#242](https://github.com/AI-SDC/AI-SDC/pull/242))
+*   Move experiments module and configs to separate repository ([#229](https://github.com/AI-SDC/AI-SDC/pull/229))
+
 ## Version 1.1.0 (Oct 11, 2023)
 
 Changes:

CITATION.cff

@@ -1,8 +1,8 @@
 cff-version: 1.2.0
 title: AI-SDC
-version: 1.1.0
-doi: 10.5281/zenodo.8430143
-date-released: 2023-10-11
+version: 1.1.1
+doi:
+date-released: 2023-10-19
 license: MIT
 repository-code: https://github.com/AI-SDC/AI-SDC
 languages:

aisdc/attacks/structural_attack.py

@@ -160,12 +160,20 @@ def get_model_param_count(model: BaseEstimator) -> int:
 
     if isinstance(model, DecisionTreeClassifier):
         n_params = get_tree_parameter_count(model)
-    elif isinstance(model, RandomForestClassifier) or (
-        isinstance(model, AdaBoostClassifier)
-        and isinstance(model.estimator, DecisionTreeClassifier)
-    ):
+
+    elif isinstance(model, RandomForestClassifier):
         for member in model.estimators_:
             n_params += get_tree_parameter_count(member)
+
+    elif isinstance(model, AdaBoostClassifier):
+        try:  # sklearn v1.2+
+            base = model.estimator
+        except AttributeError:  # sklearn version <1.2
+            base = model.base_estimator
+        if isinstance(base, DecisionTreeClassifier):
+            for member in model.estimators_:
+                n_params += get_tree_parameter_count(member)
+
     # TO-DO define these for xgb, logistic regression, SVC and others
     elif isinstance(model, XGBClassifier):
         df = model.get_booster().trees_to_dataframe()
@@ -281,10 +289,11 @@ def attack(self, target: Target) -> None:
         errstr = "len mismatch between equiv classes and "
         assert len(equiv_classes) == len(equiv_counts), errstr + "counts"
         assert len(equiv_classes) == len(equiv_members), errstr + "membership"
-        # print(f'equiv_classes is {equiv_classes}\n'
-        #   f'equiv_counts is {equiv_counts}\n'
-        #   #f'equiv_members is {equiv_members}\n'
-        #  )
+        print(
+            f"equiv_classes is {equiv_classes}\n"
+            f"equiv_counts is {equiv_counts}\n"
+            #   #f'equiv_members is {equiv_members}\n'
+        )
 
         # now assess the risk
         # Degrees of Freedom