Defer import in conversion step too

Author: ml-evs

src/optimade_maker/config.py

@@ -10,7 +10,7 @@
 __version__ = "0.1.0"
 
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Optional, Union
 
 import yaml
 from pydantic import BaseModel, Field
@@ -61,7 +61,7 @@ class PropertyDefinition(BaseModel):
             "`name` will be used for the field in the actual OPTIMADE API."
         ),
     )
-    aiida_query: Optional[list[AiidaQueryItem]] = Field(
+    aiida_query: Optional[list["AiidaQueryItem"]] = Field(
         None,
         description=("A list of AiiDA QueryBuilder steps to retrieve this property."),
     )
@@ -88,7 +88,7 @@ class EntryConfig(BaseModel):
     entry_type: str = Field(
         description="The OPTIMADE entry type, e.g. `structures` or `references`."
     )
-    entry_paths: list[ParsedFiles] | AiidaEntryPath = Field(
+    entry_paths: Union[list[ParsedFiles], "AiidaEntryPath"] = Field(
         description=(
             "A list of paths patterns to parse, provided relative to the top-level of the archive entry, "
             "after any compressed locations have been decompressed. Supports Python glob syntax for wildcards."

src/optimade_maker/convert.py

@@ -16,7 +16,10 @@
 from optimade.models import EntryInfoResource, EntryResource
 from optimade.server.schemas import ENTRY_INFO_SCHEMAS, retrieve_queryable_properties
 
-from .aiida_plugin import AiidaEntryPath, construct_entries_from_aiida
+try:
+    from .aiida_plugin import AiidaEntryPath, construct_entries_from_aiida
+except ImportError:
+    pass
 from .config import Config, EntryConfig, JSONLConfig, ParsedFiles, PropertyDefinition
 
 PROVIDER_PREFIX = os.environ.get("OPTIMAKE_PROVIDER_PREFIX", "optimake")
@@ -613,11 +616,15 @@ def construct_entries(
     provider_prefix: str,
     limit: int | None = None,
 ) -> dict[str, dict]:
-    if isinstance(entry_config.entry_paths, AiidaEntryPath):
+    try:
+        is_aiida_archive = isinstance(entry_config.entry_paths, AiidaEntryPath)
+    except Exception:
+        is_aiida_archive = False
+
+    if is_aiida_archive:
         optimade_entries = construct_entries_from_aiida(
             archive_path, entry_config, provider_prefix
         )
-
     else:
         optimade_entries = construct_entries_from_files(
             archive_path, entry_config, provider_prefix, limit=limit