Resolve merge conflicts properly

Author: Abdullah-k0de

src/google/adk/cli/__init__.py

@@ -12,13 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import Any
+from typing import TYPE_CHECKING
+
+from ..utils import _lazy
 
-from .cli_tools_click import main as _main
+if TYPE_CHECKING:
+  from .cli_tools_click import main as _main_type
 
 
 def main(args: Any = None, **kwargs: Any) -> Any:
   """Package entry point that disables Windows glob expansion for all CLI commands."""
-
   kwargs.setdefault("windows_expand_args", False)
+  from .cli_tools_click import main as _main
   return _main.main(args=args, **kwargs)
+
+
+_LAZY_MEMBERS: dict[str, str] = {}
+__all__ = ['main']
+
+__getattr__, __dir__ = _lazy.accessors(globals(), _LAZY_MEMBERS)

src/google/adk/cli/cli_tools_click.py

@@ -34,7 +34,7 @@
 import uvicorn
 
 from .. import version
-from ..agents.run_config import StreamingMode
+from ..agents._streaming_mode import StreamingMode
 from ..evaluation.constants import MISSING_EVAL_DEPENDENCIES_MESSAGE
 from ..evaluation.eval_result import EvalCaseResult
 from ..features import FeatureName