Skip to content

Commit

Permalink
Let FolderLoader not inherit from FileLoader
Browse files Browse the repository at this point in the history
  • Loading branch information
JCZuurmond committed Feb 5, 2025
1 parent f61fa43 commit 36f1b31
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/databricks/labs/ucx/source_code/folders.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@

from databricks.labs.ucx.source_code.base import is_a_notebook
from databricks.labs.ucx.source_code.files import FileLoader
from databricks.labs.ucx.source_code.graph import SourceContainer, DependencyGraph, DependencyProblem, Dependency
from databricks.labs.ucx.source_code.graph import (
Dependency,
DependencyGraph,
DependencyLoader,
DependencyProblem,
SourceContainer,
)
from databricks.labs.ucx.source_code.notebooks.loaders import NotebookLoader
from databricks.labs.ucx.source_code.path_lookup import PathLookup

Expand Down Expand Up @@ -46,13 +52,14 @@ def __repr__(self):
return f"<Folder {self._path}>"


class FolderLoader(FileLoader):
class FolderLoader(DependencyLoader):
"""Load a folder."""

def __init__(self, notebook_loader: NotebookLoader, file_loader: FileLoader):
self._notebook_loader = notebook_loader
self._file_loader = file_loader

def load_dependency(self, path_lookup: PathLookup, dependency: Dependency) -> SourceContainer | None:
def load_dependency(self, path_lookup: PathLookup, dependency: Dependency) -> Folder | None:
absolute_path = path_lookup.resolve(dependency.path)
if not absolute_path:
return None
Expand Down

0 comments on commit 36f1b31

Please sign in to comment.