metripy 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

metripy/Application/Info.py

@@ -1,17 +1,42 @@
+from importlib.metadata import version, metadata
 import toml
 
 
 class Info:
     def __init__(self):
-        data = self._get_data()
-        self.version = data["project"]["version"]
-        self.url = data["project"]["urls"]["Homepage"]
+        self.version = self._get_version()
+        self.url = self._get_homepage_url()
 
-    def _get_data(self) -> dict:
+    def _get_pyproject_data(self) -> dict:
         with open("pyproject.toml", "r") as file:
             data = toml.load(file)
         return data
 
+    def _get_version(self) -> str:
+        """Get version from installed package metadata"""
+        try:
+            return version("metripy")
+        except Exception:
+            # Fallback for development if not installed
+            return self._get_pyproject_data()["project"]["version"]
+    
+    def _get_homepage_url(self) -> str:
+        """Get homepage URL from installed package metadata"""
+        try:
+            meta = metadata("metripy")
+            # Try to get Home-Page from metadata
+            homepage = meta.get("Home-Page")
+            if not homepage:
+                # Try Project-URL field
+                for line in meta.get_all("Project-URL") or []:
+                    if line.startswith("Homepage"):
+                        homepage = line.split(",", 1)[1].strip()
+                        break
+            return homepage or "no homepage found"
+        except Exception:
+            # Fallback
+            return self._get_pyproject_data()["project"]["urls"]["Homepage"]
+
     def get_version(self) -> str:
         return self.version
 

metripy/Report/Html/Reporter.py

@@ -1,6 +1,8 @@
 import os
 import shutil
+import sys
 from datetime import datetime
+from pathlib import Path
 
 
 from metripy.Application.Config.ReportConfig import ReportConfig
@@ -16,7 +18,16 @@ class Reporter(ReporterInterface):
     ):
         self.config: ReportConfig = config
         self.output = output
-        self.template_dir = os.path.join(os.getcwd(), "templates/html_report")
+        
+        # Find templates directory - works both in development and when installed
+        template_dir = self._find_template_dir()
+        if not template_dir.exists():
+            raise FileNotFoundError(
+                f"Could not find templates directory. Searched in: "
+                f"{template_dir}"
+            )
+            
+        self.template_dir = str(template_dir)
         self.project_name = project_name
 
         self.page_renderer_factory = PageRendererFactory(
@@ -27,6 +38,28 @@ class Reporter(ReporterInterface):
             "project_name": project_name,
             "last_updated": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
         }
+    
+    def _find_template_dir(self) -> Path:
+        """Find the templates directory, checking multiple possible locations"""
+        package_dir = Path(__file__).parent.parent.parent  # metripy package root
+        
+        # List of possible locations to check
+        possible_locations = [
+            # Development: templates at project root
+            package_dir.parent / "templates" / "html_report",
+            # Alternative: templates inside metripy package
+            package_dir / "templates" / "html_report",
+            # System install location
+            Path(sys.prefix) / "share" / "metripy" / "templates" / "html_report",
+            # Fallback to cwd (for development)
+            Path.cwd() / "metripy" / "templates" / "html_report",
+        ]
+        
+        for location in possible_locations:
+            if location.exists() and (location / "index.html").exists():
+                return location
+        
+        return possible_locations[0]
 
     def generate(self, metrics: ProjectMetrics):
 
@@ -63,12 +96,6 @@ class Reporter(ReporterInterface):
         )
         # shutil.copytree(os.path.join(self.template_dir, "fonts"), os.path.join(self.config.path, "fonts"), dirs_exist_ok=True)
 
-        # copy logo, lies 2 down from the templates directory
-        shutil.copy(
-            os.path.join(self.template_dir, "../..", "logo.svg"),
-            os.path.join(self.config.path, "images", "logo.svg"),
-        )
-
         # Render main pages
         self.render_index_page(metrics)
         self.render_files_page(metrics)