loader rework, fix #12

Author: dmamelin

README.md

@@ -14,7 +14,6 @@ This **experimental** project offers a solution to enhance PyScript script devel
 
 
 ## Installation
-- **Create Mock File**: In the `pyscript/modules/` directory, create an empty file named `pyscript_mock.py`.
 - **Update PyScript Configuration**: Enable `allow_all_imports` and `hass_is_global` in your PyScript [configuration](https://github.com/custom-components/pyscript#configuration)
 - **Configure PyScript**: Add the following to your PyScript configuration in `configuration.yaml`
     - add to pyscript configuration
@@ -24,20 +23,18 @@ This **experimental** project offers a solution to enhance PyScript script devel
     ```
     - Copy the `apps/pyscript_autocomplete` folder to your PyScript directory.
 - **Generate Autocomplete Data**: Use the Home Assistant UI to call the `pyscript.autocomplete_generator` service.
-- **Integrate with Local Project**: Copy the `pyscript_mock` directory from your PyScript directory to your local project directory.
+- **Integrate with Local Project**: add `pyscript/modules` as source root in your IDE.
 - **Import in PyScript Files**: In any PyScript file, add the line `from pyscript_mock import *` for autocomplete functionality.
 
 ## Advanced Configuration
 
-- `target_path:` Specifies the directory for writing generated files. The default is `pyscript/pyscript_mock/`.
 - `exclude:` A list of regular expressions used to exclude specific services, sensors, and attributes. By default, this list is empty, meaning nothing is excluded.
 - `include:` A list of regular expressions to specifically include certain services, sensors, and attributes. By default, all are included.
 
 Example:
 ```yaml
 apps:
   pyscript_autocomplete:
-    target_path: /tmp/pyscript_mock/
     exclude:
         - person\.test\.friendly_name
     include:

apps/pyscript_autocomplete/__init__.py

@@ -11,7 +11,14 @@
 from homeassistant.helpers import service as ha_service
 from homeassistant.helpers.entity_registry import EntityRegistry
 
-from .loader import *
+from pyscript_mock import *
+# noinspection PyBroadException
+try:
+    """works in pyscript environment only"""
+    # noinspection PyUnresolvedReferences,PyUnboundLocalVariable
+    task.current_task()
+except:
+    from pyscript_builtins import *
 
 
 class Generator:
@@ -303,15 +310,20 @@ def autocomplete_generator():
 
     error_list = []
 
-    empty_module = hass.config.path(FOLDER + f"/modules/{module_name}.py")
-    if not os.path.exists(empty_module):
-        error_list.append(f"{empty_module} does not exists")
+    """Check for old loader files"""
+    old_files = (hass.config.path(FOLDER + f"/modules/{module_name}.py"), hass.config.path(FOLDER + f"/{module_name}/"))
+    for old_file in old_files:
+        if os.path.exists(old_file):
+            error_list.append(f"{old_file} exists, please remove it")
 
-    target_path = cfg.get("target_path")
-    if not target_path:
-        target_path = hass.config.path(FOLDER + f"/{module_name}/")
-    if not os.access(target_path, os.W_OK):
-        error_list.append(f"{target_path} does not exist or is not writable")
+    target_path = hass.config.path(FOLDER + f"/modules/{module_name}/")
+    try:
+        os.makedirs(target_path, exist_ok=True)
+    except OSError:
+        error_list.append(f"Creation of the directory {target_path} failed")
+
+    if os.path.exists(target_path) and not os.access(target_path, os.W_OK):
+        error_list.append(f"{target_path} is not writable")
 
     include = cfg.get("include") or []
     include_regexes = []

apps/pyscript_autocomplete/mock_init.tpl

@@ -1,2 +1,8 @@
-from pyscript_generated import *
-from pyscript_builtins import *
+# noinspection PyBroadException
+try:
+    """works in pyscript environment only"""
+    # noinspection PyUnresolvedReferences,PyUnboundLocalVariable
+    task.current_task()
+except:
+    from pyscript_generated import *
+    from pyscript_builtins import *