move version resolution into the engine

ahk/_async/engine.py

@@ -22,6 +22,8 @@
 
 from .._hotkey import Hotkey
 from .._hotkey import Hotstring
+from .._utils import _get_executable_major_version
+from .._utils import _resolve_executable_path
 from .._utils import MsgBoxButtons
 from .._utils import MsgBoxDefaultButton
 from .._utils import MsgBoxIcon
@@ -145,6 +147,27 @@ def __init__(
         extensions: list[Extension] | None | Literal['auto'] = None,
         version: Optional[Literal['v1', 'v2']] = None,
     ):
+        if version not in (None, 'v1', 'v2'):
+            raise ValueError(f'Invalid version ({version!r}). Must be one of None, "v1", or "v2"')
+        executable_path = _resolve_executable_path(executable_path=executable_path, version=version)
+        skip_version_check = False
+        if version is None:
+            try:
+                version = _get_executable_major_version(executable_path)
+            except Exception as e:
+                warnings.warn(
+                    f'Could not detect AHK version ({e}). This is likely caused by a misconfigured AutoHotkey executable and will likely cause a fatal error later on.\nAssuming v1 for now.'
+                )
+                version = 'v1'
+            skip_version_check = True
+
+        if not skip_version_check:
+            detected_version = _get_executable_major_version(executable_path)
+            if version != detected_version:
+                raise RuntimeError(
+                    f'AutoHotkey {version} was requested but AutoHotkey {detected_version} was detected for executable {executable_path}'
+                )
+        self._version: Literal['v1', 'v2'] = version
         self._extension_registry: _ExtensionMethodRegistry
         self._extensions: list[Extension]
         if extensions == 'auto':
@@ -162,6 +185,9 @@ def __init__(
         )
         self._transport: AsyncTransport = transport
 
+    def __repr__(self) -> str:
+        return f'<{self.__module__}.{self.__class__.__qualname__} object version={self._version!r}>'
+
     def __getattr__(self, name: str) -> Callable[..., Any]:
         is_async = False
         is_async = True  # unasync: remove
@@ -1332,7 +1358,7 @@ async def show_traytip(
         if second is None:
             second = 1.0
         else:
-            if self._transport._version == 'v2':
+            if self._version == 'v2':
                 warnings.warn(
                     'supplying seconds is not supported when using AutoHotkey v2. This parameter will be ignored'
                 )

ahk/_async/transport.py

@@ -48,7 +48,7 @@
     DAEMON_SCRIPT_TEMPLATE as _DAEMON_SCRIPT_TEMPLATE,
     DAEMON_SCRIPT_V2_TEMPLATE as _DAEMON_SCRIPT_V2_TEMPLATE,
 )
-from ahk._utils import _version_detection_script, _resolve_executable_path, _get_executable_major_version
+from ahk._utils import _version_detection_script
 from ahk.directives import Directive
 
 from concurrent.futures import Future, ThreadPoolExecutor
@@ -676,14 +676,7 @@ def __init__(
         self._jinja_env: jinja2.Environment
         self._execution_lock = threading.Lock()
         self._a_execution_lock = asyncio.Lock()  # unasync: remove
-        self._executable_path = _resolve_executable_path(executable_path=executable_path, version=version)
-        if version is None:
-            try:
-                version = _get_executable_major_version(self._executable_path)
-            except Exception as e:
-                warnings.warn(f'Could not detect AHK version ({e}). Defaulting to v1')
-                version = 'v1'
-            skip_version_check = True
+        self._executable_path = executable_path
 
         if version is None or version == 'v1':
             template_name = 'daemon.ahk'
@@ -694,13 +687,6 @@ def __init__(
         else:
             raise ValueError(f'Invalid version {version!r} - must be one of "v1" or "v2"')
 
-        if not skip_version_check:
-            detected_version = _get_executable_major_version(self._executable_path)
-            if version != detected_version:
-                raise RuntimeError(
-                    f'AutoHotkey {version} was requested but AutoHotkey {detected_version} was detected for executable {self._executable_path}'
-                )
-
         if jinja_loader is None:
             try:
                 loader: jinja2.BaseLoader

ahk/_sync/engine.py

@@ -22,6 +22,8 @@
 
 from .._hotkey import Hotkey
 from .._hotkey import Hotstring
+from .._utils import _get_executable_major_version
+from .._utils import _resolve_executable_path
 from .._utils import MsgBoxButtons
 from .._utils import MsgBoxDefaultButton
 from .._utils import MsgBoxIcon
@@ -141,6 +143,27 @@ def __init__(
         extensions: list[Extension] | None | Literal['auto'] = None,
         version: Optional[Literal['v1', 'v2']] = None,
     ):
+        if version not in (None, 'v1', 'v2'):
+            raise ValueError(f'Invalid version ({version!r}). Must be one of None, "v1", or "v2"')
+        executable_path = _resolve_executable_path(executable_path=executable_path, version=version)
+        skip_version_check = False
+        if version is None:
+            try:
+                version = _get_executable_major_version(executable_path)
+            except Exception as e:
+                warnings.warn(
+                    f'Could not detect AHK version ({e}). This is likely caused by a misconfigured AutoHotkey executable and will likely cause a fatal error later on.\nAssuming v1 for now.'
+                )
+                version = 'v1'
+            skip_version_check = True
+
+        if not skip_version_check:
+            detected_version = _get_executable_major_version(executable_path)
+            if version != detected_version:
+                raise RuntimeError(
+                    f'AutoHotkey {version} was requested but AutoHotkey {detected_version} was detected for executable {executable_path}'
+                )
+        self._version: Literal['v1', 'v2'] = version
         self._extension_registry: _ExtensionMethodRegistry
         self._extensions: list[Extension]
         if extensions == 'auto':
@@ -158,6 +181,9 @@ def __init__(
         )
         self._transport: Transport = transport
 
+    def __repr__(self) -> str:
+        return f'<{self.__module__}.{self.__class__.__qualname__} object version={self._version!r}>'
+
     def __getattr__(self, name: str) -> Callable[..., Any]:
         is_async = False
         if is_async:
@@ -1320,7 +1346,7 @@ def show_traytip(
         if second is None:
             second = 1.0
         else:
-            if self._transport._version == 'v2':
+            if self._version == 'v2':
                 warnings.warn(
                     'supplying seconds is not supported when using AutoHotkey v2. This parameter will be ignored'
                 )

ahk/_sync/transport.py

@@ -48,7 +48,7 @@
     DAEMON_SCRIPT_TEMPLATE as _DAEMON_SCRIPT_TEMPLATE,
     DAEMON_SCRIPT_V2_TEMPLATE as _DAEMON_SCRIPT_V2_TEMPLATE,
 )
-from ahk._utils import _version_detection_script, _resolve_executable_path, _get_executable_major_version
+from ahk._utils import _version_detection_script
 from ahk.directives import Directive
 
 from concurrent.futures import Future, ThreadPoolExecutor
@@ -640,14 +640,7 @@ def __init__(
         self.__template: jinja2.Template
         self._jinja_env: jinja2.Environment
         self._execution_lock = threading.Lock()
-        self._executable_path = _resolve_executable_path(executable_path=executable_path, version=version)
-        if version is None:
-            try:
-                version = _get_executable_major_version(self._executable_path)
-            except Exception as e:
-                warnings.warn(f'Could not detect AHK version ({e}). Defaulting to v1')
-                version = 'v1'
-            skip_version_check = True
+        self._executable_path = executable_path
 
 
         if version is None or version == 'v1':
@@ -659,10 +652,7 @@ def __init__(
         else:
             raise ValueError(f'Invalid version {version!r} - must be one of "v1" or "v2"')
 
-        if not skip_version_check:
-            detected_version = _get_executable_major_version(self._executable_path)
-            if version != detected_version:
-                raise RuntimeError(f'AutoHotkey {version} was requested but AutoHotkey {detected_version} was detected for executable {self._executable_path}')
+
 
         if jinja_loader is None:
             try:

tests/_async/test_window.py

@@ -133,6 +133,13 @@ async def test_type_escape(self):
         text = await self.win.get_text()
         assert '!' in text
 
+    async def test_send_input_manual_escapes(self):
+        await self.win.activate()
+        await self.ahk.send_input('Hello{Enter}World{!}')
+        time.sleep(0.4)
+        text = await self.win.get_text()
+        assert 'Hello\r\nWorld!' in text
+
     async def test_send_literal_tilde_n(self):
         expected_text = '```nim\nimport std/strformat\n```'
         await self.win.send(expected_text, control='Edit1')

tests/_sync/test_window.py

@@ -133,6 +133,13 @@ def test_type_escape(self):
         text = self.win.get_text()
         assert '!' in text
 
+    def test_send_input_manual_escapes(self):
+        self.win.activate()
+        self.ahk.send_input('Hello{Enter}World{!}')
+        time.sleep(0.4)
+        text = self.win.get_text()
+        assert 'Hello\r\nWorld!' in text
+
     def test_send_literal_tilde_n(self):
         expected_text = '```nim\nimport std/strformat\n```'
         self.win.send(expected_text, control='Edit1')