Merge branch 'master' of https://github.com/sassoftware/python-sasctl

Author: namera9

examples/pzmm_generate_requirements_json.ipynb

@@ -57,7 +57,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "1df8e5d3-c62e-4c35-993c-765a48d25444",
    "metadata": {},
    "outputs": [],
@@ -86,16 +86,16 @@
      "text": [
       "[\n",
       "    {\n",
-      "        \"command\": \"pip install sklearn\",\n",
+      "        \"command\": \"pip install pandas==1.5.3\",\n",
+      "        \"step\": \"install pandas\"\n",
+      "    },\n",
+      "    {\n",
+      "        \"command\": \"pip install sklearn==0.23.1\",\n",
       "        \"step\": \"install sklearn\"\n",
       "    },\n",
       "    {\n",
       "        \"command\": \"pip install numpy==1.23.5\",\n",
       "        \"step\": \"install numpy\"\n",
-      "    },\n",
-      "    {\n",
-      "        \"command\": \"pip install pandas==1.5.3\",\n",
-      "        \"step\": \"install pandas\"\n",
       "    }\n",
       "]\n"
      ]
@@ -118,7 +118,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 6,
    "id": "49721dc9-38e2-4d63-86e1-6555b364f4d6",
    "metadata": {},
    "outputs": [
@@ -128,27 +128,27 @@
      "text": [
       "[\n",
       "    {\n",
-      "        \"command\": \"pip install scikit-learn==1.2.0\",\n",
+      "        \"command\": \"pip install pandas==1.5.3\",\n",
+      "        \"step\": \"install pandas\"\n",
+      "    },\n",
+      "    {\n",
+      "        \"command\": \"pip install scikit-learn==0.23.1\",\n",
       "        \"step\": \"install scikit-learn\"\n",
       "    },\n",
       "    {\n",
       "        \"command\": \"pip install numpy==1.23.5\",\n",
       "        \"step\": \"install numpy\"\n",
-      "    },\n",
-      "    {\n",
-      "        \"command\": \"pip install pandas==1.5.3\",\n",
-      "        \"step\": \"install pandas\"\n",
       "    }\n",
       "]\n"
      ]
     }
    ],
    "source": [
-    "scikit_learn_install = {\n",
-    "    \"command\": \"pip install scikit-learn==1.2.0\",\n",
-    "    \"step\": \"install scikit-learn\"\n",
-    "}\n",
-    "requirements_json[0].update(scikit_learn_install)\n",
+    "for requirement in requirements_json:\n",
+    "    if 'sklearn' in requirement['step']:\n",
+    "        requirement['command'] = requirement[\"command\"].replace('sklearn', 'scikit-learn')\n",
+    "        requirement['step'] = requirement['step'].replace('sklearn', 'scikit-learn')\n",
+    "\n",
     "print(json.dumps(requirements_json, sort_keys=True, indent=4))"
    ]
   },
@@ -174,9 +174,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "dev-py38",
+   "display_name": "yeehaw",
    "language": "python",
-   "name": "dev-py38"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {

src/sasctl/pzmm/write_json_files.py

@@ -1639,7 +1639,7 @@ def create_requirements_json(
             ) as file:
                 file.write(json.dumps(json_dicts, indent=4))
         else:
-            return {"requirements.json": json.dumps(json_dicts)}
+            return json_dicts
 
     @staticmethod
     def get_local_package_version(package_list: List[str]) -> List[List[str]]:

src/sasctl/pzmm/write_score_code.py

@@ -721,10 +721,10 @@ def impute_missing_values(data):
         """
     impute_values = \\\n + {"var1": 0, "var2": "", "var3": 125.3}
         """
-        cls.score_code += f"\n{'':4}return data.fillna(impute_values)\n"
+        cls.score_code += f"\n{'':4}return data.replace('           .', np.nan).fillna(impute_values).apply(pd.to_numeric, errors='ignore')\n"
         """
         
-    return data.fillna(impute_values)
+    return data.replace('           .', np.nan).fillna(impute_values).apply(pd.to_numeric, errors='ignore')
         """
 
     # TODO: Needs unit test
@@ -1121,6 +1121,8 @@ def _predictions_to_metrics(
             are not given, this index should indicate whether the the target probability variable
             is the first or second variable returned by the model. The default value is 1.
         """
+        if not target_index:
+            target_index = 1
         if len(metrics) == 1 and isinstance(metrics, list):
             # Flatten single valued list
             metrics = metrics[0]