Skip to content

Commit

Permalink
importblock: resolve circular import issue
Browse files Browse the repository at this point in the history
Fixes #147

importblock uses Pipeline, and the pipeline module defines:

  _block_types = {
    ...
    "ImportBlock": importblock.ImportBlock,

which gives the following error:

```
src/instructlab/sdg/__init__.py:29: in <module>
    from .importblock import ImportBlock
src/instructlab/sdg/importblock.py:6: in <module>
    from . import pipeline
src/instructlab/sdg/pipeline.py:102: in <module>
    "ImportBlock": importblock.ImportBlock,
E   AttributeError: partially initialized module 'src.instructlab.sdg.importblock' has no attribute 'ImportBlock' (most likely due to a circular import)
```

This fixes the issue, but it's not very satisfactory, so I've included
a FIXME.

Signed-off-by: Mark McLoughlin <[email protected]>
  • Loading branch information
markmc committed Jul 16, 2024
1 parent b878f69 commit 919f6e9
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion src/instructlab/sdg/importblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from datasets import Dataset

# Local
from . import pipeline
from .block import Block
from .logger_config import setup_logger

Expand All @@ -30,6 +29,21 @@ def __init__(
"""
super().__init__(ctx, pipe, block_name)
self.path = path

# FIXME: find a better fix for this circular import error:
#
# src/instructlab/sdg/__init__.py:29: in <module>
# from .importblock import ImportBlock
# src/instructlab/sdg/importblock.py:6: in <module>
# from . import pipeline
# src/instructlab/sdg/pipeline.py:102: in <module>
# "ImportBlock": importblock.ImportBlock,
# E AttributeError: partially initialized module 'src.instructlab.sdg.importblock' has no attribute 'ImportBlock' (most likely due to a circular import)
#
# pylint: disable=C0415
# Local
from . import pipeline

self.pipeline = pipeline.Pipeline.from_file(self.ctx, self.path)

def generate(self, samples) -> Dataset:
Expand Down

0 comments on commit 919f6e9

Please sign in to comment.