Update AGN path (#660)

* Update AGN path * Bump python versions: 3.7 and 3.9 * Update list of arguments for agn_elasticc * Remove unused import * Bypass the docker * Bump classifiers with new version
astrolabsoftware · Nov 28, 2022 · 5add2aa · 5add2aa
1 parent 16899a3
commit 5add2aa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7]
+        python-version: [3.7, 3.9]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -69,11 +69,12 @@ jobs:
         cd $USRLIBS
         source scripts/start_services.sh --kafka-version ${KAFKA_VERSION} --hbase-version ${HBASE_VERSION}
         cd $FINK_HOME
+        pip install fink-science --upgrade
         fink init -c ${FINK_HOME}/conf/fink.conf.prod
         fink_simulator -c ${FINK_HOME}/conf/fink_alert_simulator.conf
         fink_test -c conf/fink.conf.prod
         curl -s https://codecov.io/bash | bash
     - uses: act10ns/slack@v1
       with:
         status: ${{ job.status }}
-      if: always()
+      if: always()
diff --git a/bin/distribute_elasticc.py b/bin/distribute_elasticc.py
@@ -102,13 +102,13 @@ def format_df_to_elasticc(df):
             F.array(
                 F.struct(
                     F.lit('AGN classifier'),
-                    F.lit('version 1.2'),
+                    F.lit('version 2.0'),
                     F.col("classes").getItem(0),
                     F.col("scores").getItem(0)
                 ),
                 F.struct(
                     F.lit('AGN classifier'),
-                    F.lit('version 1.2'),
+                    F.lit('version 2.0'),
                     F.col("classes").getItem(1),
                     F.col("scores").getItem(1)
                 ),
@@ -132,7 +132,7 @@ def format_df_to_elasticc(df):
                 ),
                 F.struct(
                     F.lit('CATS fine classifier'),
-                    F.lit('version 2.0'),
+                    F.lit('version 3.0'),
                     F.col("classes").getItem(5),
                     F.col("scores").getItem(5)
                 ),

diff --git a/fink_broker/science.py b/fink_broker/science.py
@@ -27,7 +27,6 @@
 
 from fink_utils.spark.utils import concat_col
 
-from fink_science import __file__
 from fink_science.random_forest_snia.processor import rfscore_sigmoid_full
 from fink_science.xmatch.processor import xmatch_cds, crossmatch_other_catalog
 from fink_science.snn.processor import snn_ia
@@ -39,7 +38,7 @@
 from fink_science.random_forest_snia.processor import rfscore_sigmoid_elasticc
 from fink_science.snn.processor import snn_ia_elasticc, snn_broad_elasticc
 from fink_science.cats.processor import predict_nn
-from fink_science.agn_elasticc.processor import agn_spark as agn_spark_elasticc
+from fink_science.agn.processor import agn_elasticc
 
 from fink_broker.tester import spark_unit_tests
 
@@ -408,16 +407,13 @@ def apply_science_modules_elasticc(df: DataFrame, logger: Logger) -> DataFrame:
     df = df.withColumn('cats_fine_max_prob', F.col('cbpf_preds').getItem(1))
 
     # AGN
-    path = os.path.dirname(__file__)
-    model_path_forced = "{}/data/models/AGN_elasticc_fphot.pkl".format(path)
     args_forced = [
         'diaObject.diaObjectId', 'cmidPointTai', 'cpsFlux', 'cpsFluxErr', 'cfilterName',
         'diaSource.ra', 'diaSource.decl',
         'diaObject.hostgal_zphot', 'diaObject.hostgal_zphot_err',
-        'diaObject.hostgal_ra', 'diaObject.hostgal_dec',
-        F.lit(model_path_forced)
+        'diaObject.hostgal_ra', 'diaObject.hostgal_dec'
     ]
-    df = df.withColumn('rf_agn_vs_nonagn', agn_spark_elasticc(*args_forced))
+    df = df.withColumn('rf_agn_vs_nonagn', agn_elasticc(*args_forced))
 
     # T2
     df = df.withColumn('t2_broad_class', F.lit(0))