replaced entity_ids() with state.names()

Author: craigbarratt

README.md

@@ -265,8 +265,8 @@ In cases where you need to compute the name of the state variable dynamically, o
 set the state attributes, you can use the built-in functions `state.get(name)` and
 `state.set(name, value, attr=None)`; see below.
 
-The function `entity_ids(domain=None)` returns a list of all `entity_id`s of a domain. If domain
-is not specified, it returns all entities.
+The function `state.names(domain=None)` returns a list of all state variable names (ie, `entity_id`s)
+of a domain. If `domain` is not specified, it returns all HASS state variable (entity) names.
 
 Also, service names (which are called as functions) take priority over state variable names,
 so if a component has a state variable name that collides with one of its services, you'll
@@ -582,6 +582,10 @@ set the attributes, which you can't do if you are directly assigning to the vari
 
 `state.get(name)` returns the value of the state variable, or `None` if it doesn't exist
 
+`state.names(domain=None)` returns a list of all state variable names (ie, `entity_id`s)
+of a domain. If `domain` is not specified, it returns all HASS state variable (`entity_id`)
+names.
+
 `state.set(name, value, attr=None)` sets the state variable to the given value, with the optional attributes.
 
 Note that in HASS, all state variable values are coerced into strings.  For example, if a state variable

custom_components/pyscript/eval.py

@@ -625,8 +625,8 @@ async def recurse_assign(self, lhs, val):
                             f"too few values to unpack (expected at least {len(lhs.elts) - 1})"
                         )
                     star_name = lhs_elt.value.id
-                    for lhs_idx, lhs_elt in enumerate(lhs.elts[lhs_idx + 1 :]):
-                        await self.recurse_assign(lhs_elt, star_lhs[star_len + lhs_idx])
+                    for lhs_idx2, lhs_elt in enumerate(lhs.elts[lhs_idx + 1 :]):
+                        await self.recurse_assign(lhs_elt, star_lhs[star_len + lhs_idx2])
                     await self.recurse_assign(
                         ast.Name(id=star_name, ctx=ast.Store()), star_lhs[0:star_len]
                     )

custom_components/pyscript/handler.py

@@ -34,7 +34,6 @@ def init(hass):
             "task.unique": Handler.task_unique,
             "service.call": Handler.service_call,
             "service.has_service": Handler.service_has_service,
-            "entity_ids": Handler.entity_ids,
         }
 
         #

custom_components/pyscript/state.py

@@ -140,10 +140,15 @@ def completions(root):
                     words.add(name.entity_id)
         return words
 
+    async def entity_ids(domain=None):
+        """Implement entity_ids."""
+        return State.hass.states.async_entity_ids(domain)
+
     def register_functions():
         """Register state functions."""
         functions = {
             "state.get": State.get,
             "state.set": State.set,
+            "state.names": State.entity_ids,
         }
         Handler.register(functions)

tests/custom_components/pyscript/test_func.py

@@ -33,7 +33,8 @@ async def setup_script(hass, notify_q, now, source):
     )
 
     with patch(
-        "homeassistant.loader.async_get_integration", return_value=integration,
+        "homeassistant.loader.async_get_integration",
+        return_value=integration,
     ), patch(
         "config.custom_components.pyscript.os.path.isdir", return_value=True
     ), patch(

tests/custom_components/pyscript/test_init.py

@@ -34,7 +34,8 @@ async def setup_script(hass, notify_q, now, source):
     )
 
     with patch(
-        "homeassistant.loader.async_get_integration", return_value=integration,
+        "homeassistant.loader.async_get_integration",
+        return_value=integration,
     ), patch(
         "config.custom_components.pyscript.os.path.isdir", return_value=True
     ), patch(
@@ -86,7 +87,8 @@ async def test_setup_fails_on_no_dir(hass, caplog):
     )
 
     with patch(
-        "homeassistant.loader.async_get_integration", return_value=integration,
+        "homeassistant.loader.async_get_integration",
+        return_value=integration,
     ), patch("config.custom_components.pyscript.os.path.isdir", return_value=False):
         res = await async_setup_component(hass, "pyscript", {DOMAIN: {}})
 
@@ -432,7 +434,8 @@ def func5(var_name=None, value=None):
         )
 
         with patch(
-            "homeassistant.loader.async_get_integration", return_value=integration,
+            "homeassistant.loader.async_get_integration",
+            return_value=integration,
         ), patch(
             "config.custom_components.pyscript.os.path.isdir", return_value=True
         ), patch(

tests/custom_components/pyscript/test_unique.py

@@ -32,7 +32,8 @@ async def setup_script(hass, notify_q, now, source):
     )
 
     with patch(
-        "homeassistant.loader.async_get_integration", return_value=integration,
+        "homeassistant.loader.async_get_integration",
+        return_value=integration,
     ), patch(
         "config.custom_components.pyscript.os.path.isdir", return_value=True
     ), patch(

tests/custom_components/pyscript/test_unit_eval.py

@@ -172,6 +172,10 @@
         "Foo = [type('Foo', (), {'x': [0, [[100, 101, 102, 103]]]})]; Foo[0].x[1][0][1:2] = [11, 12]; Foo[0].x[1]",
         [[100, 11, 12, 102, 103]],
     ],
+    [
+        "pyscript.var1 = 1; pyscript.var2 = 2; set(state.names('pyscript'))",
+        {"pyscript.var1", "pyscript.var2"},
+    ],
     ["eval('1+2')", 3],
     ["x = 5; eval('2 * x')", 10],
     ["x = 5; exec('x = 2 * x'); x", 10],
@@ -654,7 +658,11 @@ def get(self):
 async def run_one_test(test_data):
     """Run one interpreter test."""
     source, expect = test_data
-    global_ctx = GlobalContext("test", None, global_sym_table={},)
+    global_ctx = GlobalContext(
+        "test",
+        None,
+        global_sym_table={},
+    )
     ast = AstEval("test", global_ctx=global_ctx)
     ast.parse(source)
     if ast.get_exception() is not None: