Avoiding importing types as *

Also imported InferenceResults directly instead of indirectly through
the types .py file (which caused error)

Dockerfile

@@ -15,4 +15,4 @@ ENV PATH="${VENV}/bin:$PATH"
 
 # Install from PyPI
 RUN pip install --upgrade pip
-RUN pip install crispr-ambiguous-mapping==0.0.149
+RUN pip install crispr-ambiguous-mapping==0.0.150

crispr-ambiguous-mapping/crispr_ambiguous_mapping/models/mapping_models.py

@@ -7,7 +7,7 @@
 
 from .error_models import GuideCountError
 from .quality_control_models import QualityControlResult
-from .types import * 
+from .types import GeneralMappingInferenceDict
 
 @dataclass
 class SingleInferenceMatchResultValue:
@@ -52,12 +52,6 @@ class InferenceResult:
     inferred_value: CompleteInferenceMatchResult
 
 
-@dataclass
-class WhitelistReporterCountsResult:
-    observed_guide_reporter_umi_counts_inferred: DefaultDict[Tuple[str,Optional[str],Optional[str]], dict]
-    quality_control_result: QualityControlResult
-
-
 @dataclass
 class MatchSetWhitelistReporterCounterSeriesResults:
     ambiguous_ignored_umi_noncollapsed_counterseries : Optional[pd.Series] = None

crispr-ambiguous-mapping/crispr_ambiguous_mapping/processing/crispr_count_processing.py

@@ -1,12 +1,12 @@
 from typeguard import typechecked
 from typing import Union, List, Mapping, Tuple, Optional, Any, DefaultDict
 from typing import Counter as CounterType
-from ..models.types import *
+from ..models.types import GeneralMappingInferenceDict, GeneralMatchCountDict, GeneralMismatchCountDict
 
 
 from collections import Counter
 from collections import defaultdict
-from ..models.mapping_models import MatchSetWhitelistReporterCounterSeriesResults, CompleteInferenceMatchResult, MatchSetSingleInferenceMatchResult, SurrogateProtospacerMismatchSetWhitelistReporterCounterSeriesResults, SurrogateProtospacerMismatchSingleInferenceMatchResult, AllMatchSetWhitelistReporterCounterSeriesResults
+from ..models.mapping_models import MatchSetWhitelistReporterCounterSeriesResults, CompleteInferenceMatchResult, MatchSetSingleInferenceMatchResult, SurrogateProtospacerMismatchSetWhitelistReporterCounterSeriesResults, SurrogateProtospacerMismatchSingleInferenceMatchResult, AllMatchSetWhitelistReporterCounterSeriesResults, InferenceResult
 from .crispr_editing_processing import check_match_result_non_error, get_non_error_dict
 import pandas as pd
 

crispr-ambiguous-mapping/crispr_ambiguous_mapping/processing/crispr_editing_processing.py

@@ -3,8 +3,8 @@
 from typing import Optional, DefaultDict, Union, Tuple, List
 import pandas as pd
 from typing import Counter as CounterType
-from ..models.types import * 
-from ..models.mapping_models import CompleteInferenceMatchResult, MatchSetSingleInferenceMatchResult
+from ..models.types import GeneralMappingInferenceDict, GeneralAlleleDict, GeneralAlleleCountSeriesDict
+from ..models.mapping_models import CompleteInferenceMatchResult, MatchSetSingleInferenceMatchResult, InferenceResult
 from ..models.editing_models import (MatchSetWhitelistReporterObservedSequenceCounterSeriesResults, 
                                      MatchSetWhitelistReporterObservedSequenceMutationProfiles, 
                                      LinkedMutationCounters, 

crispr-ambiguous-mapping/crispr_ambiguous_mapping/processing/crispr_guide_counting.py

@@ -27,7 +27,6 @@
 from ..quality_control.crispr_mapping_quality_control import perform_counts_quality_control
 from ..models.mapping_models import *
 from ..models.editing_models import *
-from ..models.types import *
 
 
 # TODO: There will probably be some type errors with the DefaultDict when testing on non UMI (since it requires CounterType), so make sure to test with different variations of inputs

crispr-ambiguous-mapping/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "crispr-ambiguous-mapping"
-version = "0.0.149"
+version = "0.0.150"
 description = ""
 authors = ["Basheer Becerra <[email protected]>"]
 readme = "README.md"