remove duplicate get_machine_types call, replace if with elif, chnage the way exceptions were logged, add data type for check_kw, removed v0 endpoints

Author: Mohan Sahu

smsdk/client_v0.py

@@ -440,11 +440,10 @@ def inner(self, machine_source, types=[], return_mtype=False, **kwargs):
                         return
             try:
                 stats = self.get_machine_types(normalize=False, _limit=1, source_type=machine_type)
-                stats = self.get_machine_types(normalize=False, _limit=1, source_type=machine_type)['stats'][0]
             except KeyError:
                 # explicitly embed string to machine type names esp JCP
                 machine_type = f"'{machine_type}'"
-                stats = self.get_machine_types(normalize=False, _limit=1, source_type=machine_type)['stats'][0]
+                stats = self.get_machine_types(normalize=False, _limit=1, source_type=machine_type)
             except Exception as ex:
                 print(f"Exception in getting machine type stats {ex}")
             kwargs['stats'] = stats

smsdk/config/api_endpoints.json

@@ -3,29 +3,22 @@
     "url": "/auth/password/login"
   },
   "Cycle": {
-    "url_v1": "/v1/datatab/cycle",
-    "url": "/api/cycle",
-    "alt_url": "/api/cycle"
+    "url_v1": "/v1/datatab/cycle"
   },
   "Factory": {
-    "url" : "/api/factory",
     "url_v1" : "/v1/obj/factory"
   },
   "MachineType": {
-    "url" : "/api/machinetype",
     "url_v1" : "/v1/obj/machine_type"
   },
   "Machine": {
-    "url" : "/api/machine",
     "url_v1" : "/v1/obj/machine"
   },
   "Parts": {
-    "url" : "/api/part",
     "url_v1": "/v1/datatab/part",
     "part_schema": "/v1/obj/part_type"
   },
   "Downtime": {
-    "url" : "/api/downtime",
     "url_v1" : "/v1/datatab/downtime"
 
   },

smsdk/ma_session.py

@@ -48,8 +48,7 @@ def dict_to_df(data, normalize=True):
     if len(df) > 0:
         if '_id' in df.columns:
             df.set_index('_id', inplace=True)
-
-        if 'id' in df.columns:
+        elif 'id' in df.columns:
             df.set_index('id', inplace=True)
     return df
 
@@ -125,9 +124,8 @@ def _get_records(
                     return records
                 _offset += this_loop_limit
 
-            except:
-                import traceback
-                log.error(traceback.print_exc())
+            except Exception as e:
+                log.exception(str(e), exc_info=1)
                 return records
 
     def _get_schema(
@@ -230,10 +228,8 @@ def _get_records_v1(
                     return records
                 offset += this_loop_limit
 
-            except:
-                import traceback
-
-                log.error(traceback.print_exc())
+            except Exception as e:
+                log.exception(str(e), exc_info=1)
                 return records
 
     def get_json_headers(self):

smsdk/utils.py

@@ -28,7 +28,8 @@ def get_url(protocol, tenant, site_domain):
 
     return "{}://{}.{}".format(protocol, tenant, site_domain)
 
-def check_kw(kw) -> bool:
+def check_kw(kw: str) -> bool:
+    print(f"type of kw is {type(kw)}")
     for key in [
         "machine_type", 
         "Machine",
@@ -38,6 +39,6 @@ def check_kw(kw) -> bool:
         "Start Time",
         "starttime"
     ]:
-        if kw[0] == "_" or key in kw:
+        if kw.startswith("_") or key in kw:
             return False
     return True