updated analytics method

Author: tg359

Python_Engine/Python/src/python_toolkit/bhom/__init__.py

@@ -1,63 +1 @@
-from __future__ import annotations
-
-import functools
-import inspect
-import socket
-import sys
-import traceback
-from datetime import date, datetime
-from json import JSONEncoder, dump
-from pathlib import Path
-from uuid import uuid4
-
-import numpy as np
-import pandas as pd
-
-
-class BHoMJSONEncoder(JSONEncoder):
-    """A custom BHoM JSONEncoder class capable of serialising non-native Python datatypes into a JSONable object."""
-
-    def default(self, obj):
-        if isinstance(obj, np.ndarray):
-            return obj.tolist()
-        if isinstance(obj, (pd.Series, pd.DataFrame)):
-            return obj.to_dict()
-        if isinstance(obj, (datetime, date)):
-            return obj.isoformat()
-        if isinstance(obj, Path):
-            return obj.as_posix()
-        return JSONEncoder.default(self, obj)
-
-
-def bhom_analytics(f):
-    """A wrapper function used to capture usage analytics of the wrapped function"""
-
-    @functools.wraps(f)
-    def wrapper(*args, **kwds):
-        output_file = Path(f"C:/Temp/bhom_python_{uuid4()}.json")
-        d = {
-            "StartTime": datetime.now(),
-            "Computer": socket.gethostname(),
-            "FileName": Path(inspect.getfile(f)).as_posix(),
-            "UiVersion": sys.version,
-            "UI": Path(sys.executable).as_posix(),
-            "SelectedItem": f.__name__,
-            "Errors": [],
-        }
-        # run function and obtain errors if it failed
-        try:
-            d["Result"] = f(*args, **kwargs)
-        except Exception:
-            d["Errors"].append(traceback.format_exc())
-            d["Result"] = None
-        d["EndTime"] = datetime.now()
-
-        # TODO - make this JSON dump into an in-memory location to save on file IO overhead.
-        with open(output_file, "w+") as fp:
-            dump(d, fp, cls=BHoMJSONEncoder)
-        # print function here to enable downstream processes to access the location where the data is stored for loading into BHoM.
-        print(output_file, file=sys.stdout)
-
-        return f(*args, **kwds)
-
-    return wrapper
+

Python_Engine/Python/src/python_toolkit/bhom/analytics.py

@@ -2,7 +2,6 @@
 import inspect
 import sys
 import traceback
-from json import dump
 from pathlib import Path
 from typing import Callable
 from uuid import uuid4
@@ -14,26 +13,25 @@
 ASSEMBLIES_DIR = Path(r"C:\ProgramData\BHoM\Assemblies")
 LOGGING_DIR = Path(r"C:\ProgramData\BHoM\Logs")
 LOGGING_DIR.mkdir(exist_ok=True, parents=True)
+BHOM_VERSION = ".".join([str(i) for i in version((ASSEMBLIES_DIR / "BHoM.dll").as_posix())][:2])
+UI_NAME = "PythonBHoM"
+TICKS = ticks()
 
 
 def analytics(f: Callable):
     """A wrapper used to capture usage analytics of the decorated function."""
 
     @functools.wraps(f)
     def wrapper(*args, **kwargs):
-
-        bhom_version = ".".join([str(i) for i in version((ASSEMBLIES_DIR / "BHoM.dll").as_posix())][:2])
-        ui_name = "PythonBHoM"
-        ticks_value = ticks()
 
         _, module_stack, _, file_path = str(inspect.getmodule(f)).split(" ")
         module_stack = module_stack[1:-1]
 
-        log_file = LOGGING_DIR / f"Usage_{ui_name}_{ticks_value}.log"
+        log_file = LOGGING_DIR / f"Usage_{UI_NAME}_{TICKS}.log"
 
         # gather metadata around current callable instance
         d = {
-            "BHoMVersion": bhom_version,
+            "BHoMVersion": BHOM_VERSION,
             "BHoM_Guid": str(uuid4()),
             "CallerName": f"{module_stack}",
             "ComponentId": "",
@@ -47,17 +45,17 @@ def wrapper(*args, **kwargs):
             "SelectedItem":
             {
                 "Name": f.__name__,
-                "_bhomVersion": bhom_version,
+                "_bhomVersion": BHOM_VERSION,
                 "_t": "Python"
             },
             "Tags": [],
             "Time":
             {
-                "$date": ticks_value
+                "$date": TICKS
             },
-            "UI": ui_name,
+            "UI": UI_NAME,
             "UiVersion": sys.version,
-            "_bhomVersion": bhom_version,
+            "_bhomVersion": BHOM_VERSION,
             "_t": "BH.oM.UI.UsageLogEntry"
         }
 
@@ -67,11 +65,11 @@ def wrapper(*args, **kwargs):
         except Exception:
             d["Errors"].append(traceback.format_exc())
 
-        with open(log_file, "w+") as fp:
-            dump(d, fp, cls=Encoder)
+        with open(log_file, "a+") as fp:
+            fp.write(str(d) + "\n")
 
         # print function here to enable downstream processes to access the location where the data is stored for loading into BHoM.
-        print(log_file, file=sys.stdout)
+        #print(log_file, file=sys.stdout)
 
         return f(*args, **kwargs)