Refactored ihme functions

Also solved a merge bug (from left to inner)
ihmeuw-msca · Apr 24, 2024 · fa70e0a · fa70e0a
1 parent 538549e
commit fa70e0a
Show file tree

Hide file tree

Showing 8 changed files with 408 additions and 12 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pydisagg"
-version = "0.3.3"
+version = "0.3.4"
 authors = [{ name = "IHME Math Sciences", email = "ihme.math.sciences@gmail.com" }]
 description = ""
 readme = "README.md"

diff --git a/src/pydisagg/__init__.py b/src/pydisagg/__init__.py
@@ -4,17 +4,11 @@
     ParameterTransformation,
     disaggregate,
     models,
-    preprocess,
 )
-from .age_split import age_split, age_var, helper
 
 __all__ = [
     "DisaggModel",
     "disaggregate",
     "models",
     "ParameterTransformation",
-    "preprocess",
-    "age_split",
-    "age_var",
-    "helper",
 ]
diff --git a/src/pydisagg/age_split/__init__.py b/src/pydisagg/age_split/__init__.py
diff --git a/src/pydisagg/ihme/__init__.py b/src/pydisagg/ihme/__init__.py
@@ -0,0 +1,2 @@
+# ihme/__init__.py
+"""This is the ihme package."""
diff --git a/src/pydisagg/age_split/age_split.py → src/pydisagg/ihme/age_split.py b/src/pydisagg/age_split/age_split.py → src/pydisagg/ihme/age_split.py
@@ -17,9 +17,10 @@
 import numpy as np
 import pandas as pd
 
-from pydisagg.age_split.age_var import match_cols
-from pydisagg.disaggregate import split_datapoint
-from pydisagg.models import LogOdds_model, RateMultiplicativeModel
+from .age_var import match_cols
+from ..disaggregate import split_datapoint
+from ..models import LogOdds_model, RateMultiplicativeModel
+from typing import Optional
 
 
 def split_row(

diff --git a/src/pydisagg/age_split/age_var.py → src/pydisagg/ihme/age_var.py b/src/pydisagg/age_split/age_var.py → src/pydisagg/ihme/age_var.py
diff --git a/src/pydisagg/age_split/helper.py → src/pydisagg/ihme/helper.py b/src/pydisagg/age_split/helper.py → src/pydisagg/ihme/helper.py
@@ -1,4 +1,4 @@
-from pydisagg.age_split.age_var import rename_dict_dis
+from .age_var import rename_dict_dis
 
 
 def rename_df(frozen_df, rename_dict=rename_dict_dis, drop=True):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# ihme/__init__.py
		"""This is the ihme package."""