SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-22 04:01:27 +00:00
Code Issues Projects Releases Wiki Activity

chore: Migrate to NixOS 24.05

Browse source
This commit is contained in:
Inex Code 2024-07-26 22:59:32 +03:00
parent 5e6f343e83
commit cabb6cca90
11 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
default.nix
View file

@ -21,6 +21,7 @@ pythonPackages.buildPythonPackage rec {
uvicorn uvicorn
requests requests
websockets websockets
httpx
]; ];
pythonImportsCheck = [ "selfprivacy_api" ]; pythonImportsCheck = [ "selfprivacy_api" ];
doCheck = false; doCheck = false;

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719957072, "lastModified": 1721949857,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -8,7 +8,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
selfprivacy-graphql-api = pkgs.callPackage ./default.nix { selfprivacy-graphql-api = pkgs.callPackage ./default.nix {
pythonPackages = pkgs.python310Packages; pythonPackages = pkgs.python312Packages;
rev = self.shortRev or self.dirtyShortRev or "dirty"; rev = self.shortRev or self.dirtyShortRev or "dirty";
}; };
python = self.packages.${system}.default.pythonModule; python = self.packages.${system}.default.pythonModule;
@ -85,7 +85,7 @@
packages = with pkgs; [ packages = with pkgs; [
nixpkgs-fmt nixpkgs-fmt
rclone rclone
redis valkey
restic restic
self.packages.${system}.pytest-vm self.packages.${system}.pytest-vm
# FIXME consider loading this explicitly only after ArchLinux issue is solved # FIXME consider loading this explicitly only after ArchLinux issue is solved
@ -134,6 +134,7 @@
boot.consoleLogLevel = lib.mkForce 3; boot.consoleLogLevel = lib.mkForce 3;
documentation.enable = false; documentation.enable = false;
services.journald.extraConfig = lib.mkForce ""; services.journald.extraConfig = lib.mkForce "";
services.redis.package = pkgs.valkey;
services.redis.servers.sp-api = { services.redis.servers.sp-api = {
enable = true; enable = true;
save = [ ]; save = [ ];

4
nixos/module.nix
View file

@ -61,7 +61,7 @@ in
HOME = "/root"; HOME = "/root";
PYTHONUNBUFFERED = "1"; PYTHONUNBUFFERED = "1";
PYTHONPATH = PYTHONPATH =
pkgs.python310Packages.makePythonPath [ selfprivacy-graphql-api ]; pkgs.python312Packages.makePythonPath [ selfprivacy-graphql-api ];
} // config.networking.proxy.envVars; } // config.networking.proxy.envVars;
path = [ path = [
"/var/" "/var/"
@ -82,7 +82,7 @@ in
wantedBy = [ "network-online.target" ]; wantedBy = [ "network-online.target" ];
serviceConfig = { serviceConfig = {
User = "root"; User = "root";
ExecStart = "${pkgs.python310Packages.huey}/bin/huey_consumer.py selfprivacy_api.task_registry.huey"; ExecStart = "${pkgs.python312Packages.huey}/bin/huey_consumer.py selfprivacy_api.task_registry.huey";
Restart = "always"; Restart = "always";
RestartSec = "5"; RestartSec = "5";
}; };

2
selfprivacy_api/backup/tasks.py
View file

@ -78,7 +78,7 @@ def do_autobackup() -> None:
For some reason, we cannot launch periodic huey tasks For some reason, we cannot launch periodic huey tasks
inside tests inside tests
""" """
time = datetime.utcnow().replace(tzinfo=timezone.utc) time = datetime.now(timezone.utc)
services_to_back_up = Backups.services_to_back_up(time) services_to_back_up = Backups.services_to_back_up(time)
if not services_to_back_up: if not services_to_back_up:
return return

1
selfprivacy_api/graphql/queries/backup.py
View file

@ -50,6 +50,7 @@ def tombstone_service(service_id: str) -> Service:
url=None, url=None,
can_be_backed_up=False, can_be_backed_up=False,
backup_description="", backup_description="",
is_installed=False,
) )

4
selfprivacy_api/graphql/queries/system.py
View file

@ -158,8 +158,8 @@ class System:
) )
) )
domain_info: SystemDomainInfo = strawberry.field(resolver=get_system_domain_info) domain_info: SystemDomainInfo = strawberry.field(resolver=get_system_domain_info)
settings: SystemSettings = SystemSettings() settings: SystemSettings = strawberry.field(default_factory=SystemSettings)
info: SystemInfo = SystemInfo() info: SystemInfo = strawberry.field(default_factory=SystemInfo)
provider: SystemProviderInfo = strawberry.field(resolver=get_system_provider_info) provider: SystemProviderInfo = strawberry.field(resolver=get_system_provider_info)
@strawberry.field @strawberry.field

6
selfprivacy_api/utils/redis_pool.py
View file

@ -1,15 +1,15 @@
""" """
Redis pool module for selfprivacy_api Redis pool module for selfprivacy_api
""" """
import redis import redis
import redis.asyncio as redis_async import redis.asyncio as redis_async
from redis.asyncio.client import PubSub
from selfprivacy_api.utils.singleton_metaclass import SingletonMetaclass
REDIS_SOCKET = "/run/redis-sp-api/redis.sock" REDIS_SOCKET = "/run/redis-sp-api/redis.sock"
# class RedisPool(metaclass=SingletonMetaclass):
class RedisPool: class RedisPool:
""" """
Redis connection pool singleton. Redis connection pool singleton.
@ -51,7 +51,7 @@ class RedisPool:
""" """
return redis_async.Redis(connection_pool=self._async_pool) return redis_async.Redis(connection_pool=self._async_pool)
async def subscribe_to_keys(self, pattern: str) -> redis_async.client.PubSub: async def subscribe_to_keys(self, pattern: str) -> PubSub:
async_redis = self.get_connection_async() async_redis = self.get_connection_async()
pubsub = async_redis.pubsub() pubsub = async_redis.pubsub()
await pubsub.psubscribe(f"__keyspace@{self._dbnumber}__:" + pattern) await pubsub.psubscribe(f"__keyspace@{self._dbnumber}__:" + pattern)

57
tests/test_config_item.py
View file

@ -12,7 +12,10 @@ def service_options():
return {} return {}
def test_string_service_config_item(service_options): DUMMY_SERVICE = "testservice"
def test_string_service_config_item(dummy_service):
item = StringServiceConfigItem( item = StringServiceConfigItem(
id="test_string", id="test_string",
default_value="1337", default_value="1337",
@ -21,11 +24,11 @@ def test_string_service_config_item(service_options):
widget="text", widget="text",
allow_empty=False, allow_empty=False,
) )
assert item.get_value(service_options) == "1337" assert item.get_value(DUMMY_SERVICE) == "1337"
item.set_value("123", service_options) item.set_value("123", DUMMY_SERVICE)
assert item.get_value(service_options) == "123" assert item.get_value(DUMMY_SERVICE) == "123"
with pytest.raises(ValueError): with pytest.raises(ValueError):
item.set_value("abc", service_options) item.set_value("abc", DUMMY_SERVICE)
assert item.validate_value("123") is True assert item.validate_value("123") is True
assert item.validate_value("abc") is False assert item.validate_value("abc") is False
assert item.validate_value("123abc") is False assert item.validate_value("123abc") is False
@ -36,7 +39,7 @@ def test_string_service_config_item(service_options):
assert item.validate_value(True) is False assert item.validate_value(True) is False
def test_string_service_config_item_allows_empty(service_options): def test_string_service_config_item_allows_empty(dummy_service):
item = StringServiceConfigItem( item = StringServiceConfigItem(
id="test_string", id="test_string",
default_value="1337", default_value="1337",
@ -44,9 +47,9 @@ def test_string_service_config_item_allows_empty(service_options):
widget="text", widget="text",
allow_empty=True, allow_empty=True,
) )
assert item.get_value(service_options) == "1337" assert item.get_value(DUMMY_SERVICE) == "1337"
item.set_value("", service_options) item.set_value("", DUMMY_SERVICE)
assert item.get_value(service_options) == "" assert item.get_value(DUMMY_SERVICE) == ""
assert item.validate_value("") is True assert item.validate_value("") is True
assert item.validate_value(None) is False assert item.validate_value(None) is False
assert item.validate_value(123) is False assert item.validate_value(123) is False
@ -57,17 +60,17 @@ def test_string_service_config_item_allows_empty(service_options):
assert item.validate_value(True) is False assert item.validate_value(True) is False
def test_string_service_config_item_not_allows_empty(service_options): def test_string_service_config_item_not_allows_empty(dummy_service):
item = StringServiceConfigItem( item = StringServiceConfigItem(
id="test_string", id="test_string",
default_value="1337", default_value="1337",
description="Test digits string", description="Test digits string",
widget="text", widget="text",
) )
assert item.get_value(service_options) == "1337" assert item.get_value(DUMMY_SERVICE) == "1337"
with pytest.raises(ValueError): with pytest.raises(ValueError):
item.set_value("", service_options) item.set_value("", DUMMY_SERVICE)
assert item.get_value(service_options) == "1337" assert item.get_value(DUMMY_SERVICE) == "1337"
assert item.validate_value("") is False assert item.validate_value("") is False
assert item.validate_value(None) is False assert item.validate_value(None) is False
assert item.validate_value(123) is False assert item.validate_value(123) is False
@ -78,16 +81,16 @@ def test_string_service_config_item_not_allows_empty(service_options):
assert item.validate_value(True) is False assert item.validate_value(True) is False
def test_bool_service_config_item(service_options): def test_bool_service_config_item(dummy_service):
item = BoolServiceConfigItem( item = BoolServiceConfigItem(
id="test_bool", id="test_bool",
default_value=True, default_value=True,
description="Test bool", description="Test bool",
widget="switch", widget="switch",
) )
assert item.get_value(service_options) is True assert item.get_value(DUMMY_SERVICE) is True
item.set_value(False, service_options) item.set_value(False, DUMMY_SERVICE)
assert item.get_value(service_options) is False assert item.get_value(DUMMY_SERVICE) is False
assert item.validate_value(True) is True assert item.validate_value(True) is True
assert item.validate_value(False) is True assert item.validate_value(False) is True
assert item.validate_value("True") is False assert item.validate_value("True") is False
@ -97,7 +100,7 @@ def test_bool_service_config_item(service_options):
assert item.validate_value("1") is False assert item.validate_value("1") is False
def test_enum_service_config_item(service_options): def test_enum_service_config_item(dummy_service):
item = EnumServiceConfigItem( item = EnumServiceConfigItem(
id="test_enum", id="test_enum",
default_value="option1", default_value="option1",
@ -105,11 +108,11 @@ def test_enum_service_config_item(service_options):
options=["option1", "option2", "option3"], options=["option1", "option2", "option3"],
widget="select", widget="select",
) )
assert item.get_value(service_options) == "option1" assert item.get_value(DUMMY_SERVICE) == "option1"
item.set_value("option2", service_options) item.set_value("option2", DUMMY_SERVICE)
assert item.get_value(service_options) == "option2" assert item.get_value(DUMMY_SERVICE) == "option2"
with pytest.raises(ValueError): with pytest.raises(ValueError):
item.set_value("option4", service_options) item.set_value("option4", DUMMY_SERVICE)
assert item.validate_value("option1") is True assert item.validate_value("option1") is True
assert item.validate_value("option4") is False assert item.validate_value("option4") is False
assert item.validate_value("option2") is True assert item.validate_value("option2") is True
@ -118,7 +121,7 @@ def test_enum_service_config_item(service_options):
assert item.validate_value(True) is False assert item.validate_value(True) is False
def test_string_service_config_item_subdomain(service_options, dummy_service): def test_string_service_config_item_subdomain(dummy_service):
item = StringServiceConfigItem( item = StringServiceConfigItem(
id="test_subdomain", id="test_subdomain",
default_value="example", default_value="example",
@ -127,13 +130,13 @@ def test_string_service_config_item_subdomain(service_options, dummy_service):
allow_empty=False, allow_empty=False,
regex=SUBDOMAIN_REGEX, regex=SUBDOMAIN_REGEX,
) )
assert item.get_value(service_options) == "example" assert item.get_value(DUMMY_SERVICE) == "example"
item.set_value("subdomain", service_options) item.set_value("subdomain", DUMMY_SERVICE)
assert item.get_value(service_options) == "subdomain" assert item.get_value(DUMMY_SERVICE) == "subdomain"
with pytest.raises(ValueError): with pytest.raises(ValueError):
item.set_value( item.set_value(
"invalid-subdomain-because-it-is-very-very-very-very-very-very-long", "invalid-subdomain-because-it-is-very-very-very-very-very-very-long",
service_options, DUMMY_SERVICE,
) )
assert item.validate_value("subdomain") is True assert item.validate_value("subdomain") is True
assert ( assert (

4
tests/test_graphql/test_api_backup.py
View file

@ -218,7 +218,7 @@ def api_set_quotas(authorized_client, quotas: _AutobackupQuotas):
"/graphql", "/graphql",
json={ json={
"query": API_SET_AUTOBACKUP_QUOTAS_MUTATION, "query": API_SET_AUTOBACKUP_QUOTAS_MUTATION,
"variables": {"input": quotas.dict()}, "variables": {"input": quotas.model_dump()},
}, },
) )
return response return response
@ -401,7 +401,7 @@ def test_autobackup_quotas_nonzero(authorized_client, backups):
assert_ok(data) assert_ok(data)
configuration = data["configuration"] configuration = data["configuration"]
assert configuration["autobackupQuotas"] == quotas assert configuration["autobackupQuotas"] == quotas.model_dump()
def test_autobackup_period_nonzero(authorized_client, backups): def test_autobackup_period_nonzero(authorized_client, backups):

1
tests/test_redis.py
View file

@ -70,7 +70,6 @@ async def test_pubsub(empty_redis, event_loop):
# Sanity checking because of previous event loop bugs # Sanity checking because of previous event loop bugs
assert event_loop == asyncio.get_event_loop() assert event_loop == asyncio.get_event_loop()
assert event_loop == asyncio.events.get_event_loop() assert event_loop == asyncio.events.get_event_loop()
assert event_loop == asyncio.events._get_event_loop()
assert event_loop == asyncio.events.get_running_loop() assert event_loop == asyncio.events.get_running_loop()
reader = streams.StreamReader(34) reader = streams.StreamReader(34)