fix: resolve ty import conflicts

Author: amjith

CHANGELOG.md

@@ -12,6 +12,7 @@
 
 - Clean up ty type-checking for optional sqlean/llm imports.
 - Add an llm module alias for test patching.
+- Avoid ty conflicts for optional sqlite/llm imports.
 
 ## 1.18.0 
 

litecli/main.py

@@ -46,12 +46,18 @@
 from .sqlcompleter import SQLCompleter
 from .sqlexecute import SQLExecute
 
-try:
-    import sqlean as _sqlite3
-except ImportError:
-    import sqlite3 as _sqlite3
 
-_sqlite3 = cast(Any, _sqlite3)
+def _load_sqlite3() -> Any:
+    try:
+        import sqlean
+    except ImportError:
+        import sqlite3
+
+        return sqlite3
+    return sqlean
+
+
+_sqlite3 = _load_sqlite3()
 OperationalError = _sqlite3.OperationalError
 sqlite_version = _sqlite3.sqlite_version
 

litecli/packages/special/llm.py

@@ -15,20 +15,28 @@
 
 import click
 
-try:
-    import llm as llm_module
-except ImportError:
-    llm_module = None
-
-try:
-    llm_cli_module = importlib.import_module("llm.cli")
-except ImportError:
-    llm_cli_module = None
-
 from . import export
 from .main import Verbosity, parse_special_command
 from .types import DBCursor
 
+
+def _load_llm_module() -> Any | None:
+    try:
+        return importlib.import_module("llm")
+    except ImportError:
+        return None
+
+
+def _load_llm_cli_module() -> Any | None:
+    try:
+        return importlib.import_module("llm.cli")
+    except ImportError:
+        return None
+
+
+llm_module = _load_llm_module()
+llm_cli_module = _load_llm_cli_module()
+
 # Alias for tests and patching.
 llm = llm_module
 

tests/test_sqlexecute.py

@@ -1,18 +1,24 @@
 # coding=UTF-8
 
 import os
-from typing import Any, cast
+from typing import Any
 
 import pytest
 
 from .utils import assert_result_equal, dbtest, is_expanded_output, run, set_expanded_output
 
-try:
-    import sqlean as _sqlite3
-except ImportError:
-    import sqlite3 as _sqlite3
 
-_sqlite3 = cast(Any, _sqlite3)
+def _load_sqlite3() -> Any:
+    try:
+        import sqlean
+    except ImportError:
+        import sqlite3
+
+        return sqlite3
+    return sqlean
+
+
+_sqlite3 = _load_sqlite3()
 OperationalError = _sqlite3.OperationalError
 ProgrammingError = _sqlite3.ProgrammingError