cleaning up

MANIFEST.in

@@ -1,5 +1,3 @@
-include tbtamr/test/*
-include tbtamr/db/*
-include tbtamr/*.json
+include mutamr/references/*
 
 

tbtamr/Predict.py

@@ -1,7 +1,7 @@
 import sys,gzip,pandas,pathlib,json
 from CustomLog import logger
-
-
+from version import db_version
+from datetime import date
 import warnings;
 warnings.simplefilter(action='ignore', category=FutureWarning)
 
@@ -344,7 +344,9 @@ def cascade_report(self, result, starter_cols):
         return starter_cols
 
     def generate_reporting_df(self, result, output, cols) -> pandas.DataFrame:
-
+
+        cols.extend(['db version', 'Date analysed'])
+
         df = pandas.DataFrame.from_dict(result, orient= 'index').T
         df = df[cols]
         rnm = {}
@@ -423,7 +425,11 @@ def get_rules(self, rules) -> pandas.DataFrame:
 
     def initiate_results(self) -> dict:
 
-        return {"seq_id": self.seq_id}
+        return {
+                "seq_id": self.seq_id,
+                "db version": db_version,
+                "Date analysed":date.today().strftime('%Y-%m-%d')
+                }
 
     def species(self,lineage) -> str:
 

tbtamr/version.py

@@ -1,2 +1,2 @@
-__version__ = '0.1.0'
+__version__ = '1.0.0'
 db_version = 'who_2024'