roboherd 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of roboherd might be problematic. Click here for more details.
- roboherd/cow/__init__.py +20 -19
- roboherd/cow/test_init.py +14 -30
- roboherd/herd/manager/config.py +30 -6
- roboherd/herd/manager/test_config.py +2 -0
- {roboherd-0.1.7.dist-info → roboherd-0.1.8.dist-info}/METADATA +1 -1
- {roboherd-0.1.7.dist-info → roboherd-0.1.8.dist-info}/RECORD +8 -8
- {roboherd-0.1.7.dist-info → roboherd-0.1.8.dist-info}/WHEEL +0 -0
- {roboherd-0.1.7.dist-info → roboherd-0.1.8.dist-info}/entry_points.txt +0 -0
roboherd/cow/__init__.py
CHANGED
|
@@ -76,6 +76,13 @@ class RoboCow:
|
|
|
76
76
|
),
|
|
77
77
|
)
|
|
78
78
|
|
|
79
|
+
skip_profile_update: bool = field(
|
|
80
|
+
default=False,
|
|
81
|
+
metadata=dict(
|
|
82
|
+
description="When set to True the profile is not updated automatically. Useful when managing a cow from multiple scripts."
|
|
83
|
+
),
|
|
84
|
+
)
|
|
85
|
+
|
|
79
86
|
internals: RoboCowInternals = field(
|
|
80
87
|
default_factory=RoboCowInternals,
|
|
81
88
|
metadata=dict(description="Internal data for the cow"),
|
|
@@ -166,19 +173,6 @@ class RoboCow:
|
|
|
166
173
|
|
|
167
174
|
self.internals.startup_routine = func
|
|
168
175
|
|
|
169
|
-
def needs_update(self):
|
|
170
|
-
"""Checks if the cow needs to be updated"""
|
|
171
|
-
if self.internals.profile is None:
|
|
172
|
-
return True
|
|
173
|
-
|
|
174
|
-
if self.information.name != self.internals.profile.get("name"):
|
|
175
|
-
return True
|
|
176
|
-
|
|
177
|
-
if self.information.description != self.internals.profile.get("summary"):
|
|
178
|
-
return True
|
|
179
|
-
|
|
180
|
-
return False
|
|
181
|
-
|
|
182
176
|
async def run_startup(self, connection: Almabtrieb):
|
|
183
177
|
"""Runs when the cow is birthed"""
|
|
184
178
|
|
|
@@ -198,12 +192,8 @@ class RoboCow:
|
|
|
198
192
|
)
|
|
199
193
|
self.information.frequency = frequency
|
|
200
194
|
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
if update:
|
|
204
|
-
logger.info("Updating profile for %s", self.information.handle)
|
|
205
|
-
|
|
206
|
-
await connection.trigger("update_actor", update)
|
|
195
|
+
if not self.skip_profile_update:
|
|
196
|
+
await self._run_profile_update(connection)
|
|
207
197
|
|
|
208
198
|
if self.internals.startup_routine:
|
|
209
199
|
await inject(self.internals.startup_routine)(
|
|
@@ -211,3 +201,14 @@ class RoboCow:
|
|
|
211
201
|
connection=connection, # type:ignore
|
|
212
202
|
actor_id=self.internals.actor_id, # type:ignore
|
|
213
203
|
) # type:ignore
|
|
204
|
+
|
|
205
|
+
async def _run_profile_update(self, connection: Almabtrieb):
|
|
206
|
+
if self.internals.profile is None:
|
|
207
|
+
raise ValueError("Profile is not set")
|
|
208
|
+
|
|
209
|
+
update = determine_profile_update(self.information, self.internals.profile)
|
|
210
|
+
|
|
211
|
+
if update:
|
|
212
|
+
logger.info("Updating profile for %s", self.information.handle)
|
|
213
|
+
|
|
214
|
+
await connection.trigger("update_actor", update)
|
roboherd/cow/test_init.py
CHANGED
|
@@ -1,38 +1,9 @@
|
|
|
1
|
-
import pytest
|
|
2
1
|
from unittest.mock import AsyncMock
|
|
3
2
|
|
|
4
3
|
from . import RoboCow
|
|
5
4
|
from .types import Information
|
|
6
5
|
|
|
7
6
|
|
|
8
|
-
@pytest.mark.parametrize(
|
|
9
|
-
"name,summary,profile,expected",
|
|
10
|
-
[
|
|
11
|
-
("moocow", None, None, True),
|
|
12
|
-
("moocow", None, {"id": "123"}, True),
|
|
13
|
-
("moocow", None, {"id": "123", "name": "moocow"}, False),
|
|
14
|
-
("moocow", None, {"id": "123", "name": "other"}, True),
|
|
15
|
-
("moocow", "description", {"id": "123", "name": "moocow"}, True),
|
|
16
|
-
(
|
|
17
|
-
"moocow",
|
|
18
|
-
"description",
|
|
19
|
-
{"id": "123", "name": "moocow", "summary": "description"},
|
|
20
|
-
False,
|
|
21
|
-
),
|
|
22
|
-
],
|
|
23
|
-
)
|
|
24
|
-
def test_needs_update(name, summary, profile, expected):
|
|
25
|
-
info = Information(
|
|
26
|
-
handle="testcow",
|
|
27
|
-
name=name,
|
|
28
|
-
description=summary,
|
|
29
|
-
)
|
|
30
|
-
cow = RoboCow(information=info)
|
|
31
|
-
cow.internals.profile = profile
|
|
32
|
-
|
|
33
|
-
assert cow.needs_update() == expected
|
|
34
|
-
|
|
35
|
-
|
|
36
7
|
def test_cron():
|
|
37
8
|
info = Information(handle="testcow")
|
|
38
9
|
cow = RoboCow(information=info)
|
|
@@ -49,9 +20,22 @@ async def test_startup():
|
|
|
49
20
|
cow = RoboCow(information=info)
|
|
50
21
|
cow.internals.profile = {"id": "http://host.test/actor/cow"}
|
|
51
22
|
mock = AsyncMock()
|
|
23
|
+
connection = AsyncMock()
|
|
52
24
|
|
|
53
25
|
cow.startup(mock)
|
|
54
26
|
|
|
55
|
-
await cow.run_startup(
|
|
27
|
+
await cow.run_startup(connection=connection)
|
|
56
28
|
|
|
57
29
|
mock.assert_called_once()
|
|
30
|
+
connection.trigger.assert_awaited_once()
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
async def test_skip_startup():
|
|
34
|
+
info = Information(handle="testcow")
|
|
35
|
+
cow = RoboCow(information=info, skip_profile_update=True)
|
|
36
|
+
cow.internals.profile = {"id": "http://host.test/actor/cow"}
|
|
37
|
+
|
|
38
|
+
connection = AsyncMock()
|
|
39
|
+
await cow.run_startup(connection=connection)
|
|
40
|
+
|
|
41
|
+
connection.trigger.assert_not_awaited()
|
roboherd/herd/manager/config.py
CHANGED
|
@@ -1,9 +1,32 @@
|
|
|
1
|
+
from pydantic import BaseModel, Field
|
|
2
|
+
|
|
1
3
|
from dataclasses import dataclass, field
|
|
2
4
|
|
|
3
5
|
from roboherd.cow import RoboCow
|
|
4
6
|
from .load import load_cow
|
|
5
7
|
|
|
6
8
|
|
|
9
|
+
class ConfigOverrides(BaseModel):
|
|
10
|
+
"""Values used in `roboherd.toml` to overide the default
|
|
11
|
+
values in the imported cow. This class is meant as a
|
|
12
|
+
reference, and not meant to be directly used."""
|
|
13
|
+
|
|
14
|
+
name: str | None = Field(
|
|
15
|
+
default=None, description="set to override the name", examples=["New name"]
|
|
16
|
+
)
|
|
17
|
+
handle: str | None = Field(
|
|
18
|
+
default=None, description="set to override the handle", examples=["new-handle"]
|
|
19
|
+
)
|
|
20
|
+
base_url: str | None = Field(
|
|
21
|
+
default=None,
|
|
22
|
+
description="set to override the base url",
|
|
23
|
+
examples=["https://other.example"],
|
|
24
|
+
)
|
|
25
|
+
skip_profile_update: bool | None = Field(
|
|
26
|
+
default=None, description="set to skip updating the profile", examples=[True]
|
|
27
|
+
)
|
|
28
|
+
|
|
29
|
+
|
|
7
30
|
@dataclass
|
|
8
31
|
class CowConfig:
|
|
9
32
|
name: str = field(metadata={"description": "Name of the cow, must be unique"})
|
|
@@ -20,13 +43,14 @@ class CowConfig:
|
|
|
20
43
|
def load(self) -> RoboCow:
|
|
21
44
|
cow = load_cow(self.module, self.attribute)
|
|
22
45
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
46
|
+
overrides = ConfigOverrides(**self.config)
|
|
47
|
+
|
|
48
|
+
for value in ["name", "handle", "base_url"]:
|
|
49
|
+
if getattr(overrides, value):
|
|
50
|
+
setattr(cow.information, value, getattr(overrides, value))
|
|
27
51
|
|
|
28
|
-
if
|
|
29
|
-
cow.
|
|
52
|
+
if overrides.skip_profile_update:
|
|
53
|
+
cow.skip_profile_update = overrides.skip_profile_update
|
|
30
54
|
|
|
31
55
|
return cow
|
|
32
56
|
|
|
@@ -44,6 +44,7 @@ def test_from_name_and_dict_with_new_name():
|
|
|
44
44
|
"bot": "roboherd.examples.moocow:moocow",
|
|
45
45
|
"handle": "new_handle",
|
|
46
46
|
"name": "new name",
|
|
47
|
+
"skip_profile_update": True,
|
|
47
48
|
}
|
|
48
49
|
|
|
49
50
|
config = CowConfig.from_name_and_dict(name, value)
|
|
@@ -52,6 +53,7 @@ def test_from_name_and_dict_with_new_name():
|
|
|
52
53
|
|
|
53
54
|
assert cow.information.name == "new name"
|
|
54
55
|
assert cow.information.handle == "new_handle"
|
|
56
|
+
assert cow.skip_profile_update is True
|
|
55
57
|
|
|
56
58
|
|
|
57
59
|
def test_load_config(test_config):
|
|
@@ -7,12 +7,12 @@ roboherd/validators.py,sha256=2mc43ZGwFazp4f3B9J4RxZCU4Y_ErSNotib8MnYVtmY,140
|
|
|
7
7
|
roboherd/annotations/__init__.py,sha256=BrP5UWiVnh8FwmHc6wEY3G69BStidGUpF8uP4Ea5-dg,1140
|
|
8
8
|
roboherd/annotations/bovine.py,sha256=cFLUSFzTulikNjZb1lLq5v4tGjL1i7_dR3H6wimegCg,2322
|
|
9
9
|
roboherd/annotations/common.py,sha256=n5rm8WTgsg116RczKdzm_VoPg1mBk_IMf2V7l8UgWKQ,1351
|
|
10
|
-
roboherd/cow/__init__.py,sha256=
|
|
10
|
+
roboherd/cow/__init__.py,sha256=wSfYordSLmn3azxWkZs36h3ipbS6NdPh9kAWyyg0NIU,6223
|
|
11
11
|
roboherd/cow/const.py,sha256=fj5nUJUIlcpr1AU2Ur55ToR7iVmYv4UnfdxiQwguv-k,166
|
|
12
12
|
roboherd/cow/handlers.py,sha256=k5Tc1M--wqmZ2EZvzIfID4dp8XE0rN18puMTKkNVjjE,1491
|
|
13
13
|
roboherd/cow/profile.py,sha256=ldeYq50lh97dl50QjOZiGopEbXtCoEsE5QJoXB5XUYU,3330
|
|
14
14
|
roboherd/cow/test_handlers.py,sha256=SwrZZcU_BD2BpJUFg18mFEsyUqu7N81-MkjIaGv7whQ,1673
|
|
15
|
-
roboherd/cow/test_init.py,sha256=
|
|
15
|
+
roboherd/cow/test_init.py,sha256=GrOFyEKbvkddrUQM7B0RFelNLc_rmdlxU_8C-DjoUh8,999
|
|
16
16
|
roboherd/cow/test_profile.py,sha256=f7HE0iVgbpuNv6znEqi-4l1o_8UZ9ufQpjSVP7Xf1wc,2160
|
|
17
17
|
roboherd/cow/test_util.py,sha256=8FLRtVdSMmIo6NSpCpB9mS0PwOCpGgUeDAA1q6Gv0P4,430
|
|
18
18
|
roboherd/cow/types.py,sha256=TGXTcPuND7xMly3xFXZyIR7UE3XWyF_MLRuBHWKoFEE,1925
|
|
@@ -33,12 +33,12 @@ roboherd/herd/test_herd.py,sha256=sQkzGCWdFveLklhaOJUybtl7odO-QOSDdd-_gan1py8,84
|
|
|
33
33
|
roboherd/herd/test_scheduler.py,sha256=wLisqRMSl734P_rjbqMNH5WTQKepwihgr7ZC32nEj80,424
|
|
34
34
|
roboherd/herd/types.py,sha256=_EidQbglm0jpsKX1EsL6U2qm_J5wCPhwUi6Avac22Ow,210
|
|
35
35
|
roboherd/herd/manager/__init__.py,sha256=NqOJsp1CdAobjARJGmzvU1ceTW7j2bt0FdRbpM8iFUw,1464
|
|
36
|
-
roboherd/herd/manager/config.py,sha256=
|
|
36
|
+
roboherd/herd/manager/config.py,sha256=8m-313_wn_-b4ivPSoPyyTQh0ONNLcd-Zz3pgWh8p1c,2429
|
|
37
37
|
roboherd/herd/manager/load.py,sha256=BoeBID2UGP--sIKwITABQkQv2lMc9Y8pyp7_nleu2bw,351
|
|
38
|
-
roboherd/herd/manager/test_config.py,sha256=
|
|
38
|
+
roboherd/herd/manager/test_config.py,sha256=I2EP7nEUdBVO8Wqot7SRhzp5UZFr5oGIuFS7cNB2iFk,1745
|
|
39
39
|
roboherd/herd/manager/test_load.py,sha256=zyu5LIChMfTnxu_tYK63-bSOHYn1K1zUlbDY5DkE3GY,514
|
|
40
40
|
roboherd/herd/manager/test_manager.py,sha256=9pSMaH7zmN-zagYCIBpQcV3Q0sBT7XZSCvsmLVC0rOI,1047
|
|
41
|
-
roboherd-0.1.
|
|
42
|
-
roboherd-0.1.
|
|
43
|
-
roboherd-0.1.
|
|
44
|
-
roboherd-0.1.
|
|
41
|
+
roboherd-0.1.8.dist-info/METADATA,sha256=SoBEuuNWN1AYoDfom7330kaSYHcKYTzfIARF0FqE4NM,1007
|
|
42
|
+
roboherd-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
43
|
+
roboherd-0.1.8.dist-info/entry_points.txt,sha256=WebdVUmh8Ot-FupKJY6Du8LuFbmezt9yoy2UICqV3bE,52
|
|
44
|
+
roboherd-0.1.8.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|