Fixed more circular imports

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.150
+RUN pip install crispr-ambiguous-mapping==0.0.151

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

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Counter as CounterType
 from typing import Tuple, Optional, DefaultDict, Dict
-from .types import *
+from .types import GeneralAlleleCountSeriesDict
 import pandas as pd
 
 @dataclass

crispr-ambiguous-mapping/crispr_ambiguous_mapping/parsing/reporter_umitools_fastq_parsing.py

@@ -4,7 +4,7 @@
 from typeguard import typechecked
 from typing import Union, Optional, List, Tuple, DefaultDict
 from typing import Counter as CounterType
-from ..models.types import *
+from ..models.types import ProtospacerCounter, ProtospacerDictUMICounter, ProtospacerBarcodeCounter, ProtospacerBarcodeDictUMICounter, ProtospacerSurrogateCounter, ProtospacerSurrogateDictUMICounter, ProtospacerSurrogateBarcodeCounter, ProtospacerSurrogateBarcodeDictUMICounter
 from collections import Counter
 from typing import Callable
 from functools import partial

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

@@ -25,8 +25,8 @@
 from . import crispr_guide_inference
 from .crispr_count_processing import get_counterseries_all_results
 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 GeneralGuideCountType, GeneralMappingInferenceDict
+from ..models.mapping_models import WhitelistReporterCountsResult, InferenceResult, CountInput
 
 
 # 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.150"
+version = "0.0.151"
 description = ""
 authors = ["Basheer Becerra <[email protected]>"]
 readme = "README.md"