From e4e881f81675db44c9702fe6e1fdf1b4b0809352 Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Tue, 10 Sep 2024 18:41:33 +0200 Subject: [PATCH 1/2] Update yagna and ya-runtime-ai version --- Golem.Package/Args.cs | 4 ++-- Golem.Tools/GolemPackageBuilder.cs | 2 +- MockGUI/readme.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Golem.Package/Args.cs b/Golem.Package/Args.cs index 808c290..e86fcb5 100644 --- a/Golem.Package/Args.cs +++ b/Golem.Package/Args.cs @@ -5,9 +5,9 @@ public class BuildArgs { [Option('t', "target", Default = "package", Required = false, HelpText = "Directory where binaries will be generated relative to working dir")] public required string Target { get; set; } - [Option('y', "yagna-version", Default = "pre-rel-v0.16.0-preview.ai.42", Required = false, HelpText = "Yagna version github tag")] + [Option('y', "yagna-version", Default = "pre-rel-v0.16.0-preview.ai.46", Required = false, HelpText = "Yagna version github tag")] public required string GolemVersion { get; set; } - [Option('r', "runtime-version", Default = "v0.2.5", Required = false, HelpText = "Runtime version github tag")] + [Option('r', "runtime-version", Default = "pre-rel-v0.2.6-rc2", Required = false, HelpText = "Runtime version github tag")] public required string RuntimeVersion { get; set; } [Option('c', "dont-clean", Default = false, Required = false, HelpText = "Remove temporary directories")] public required bool DontClean { get; set; } diff --git a/Golem.Tools/GolemPackageBuilder.cs b/Golem.Tools/GolemPackageBuilder.cs index f4e2713..6e10364 100644 --- a/Golem.Tools/GolemPackageBuilder.cs +++ b/Golem.Tools/GolemPackageBuilder.cs @@ -18,7 +18,7 @@ namespace Golem.Tools { public class PackageBuilder { - public static string CURRENT_GOLEM_VERSION = "pre-rel-v0.16.0-preview.ai.42"; + public static string CURRENT_GOLEM_VERSION = "pre-rel-v0.16.0-preview.ai.46"; public static string CURRENT_RUNTIME_VERSION = "v0.2.5"; internal static string InitTestDirectory(string name, bool cleanupData = true) diff --git a/MockGUI/readme.md b/MockGUI/readme.md index e98f69b..837e83a 100644 --- a/MockGUI/readme.md +++ b/MockGUI/readme.md @@ -39,7 +39,7 @@ dotnet run --project Golem.Package -- download --target modules --version pre-re In case of building artifacts locally you can specify `yagna` and `runtimes` versions: ```sh -dotnet run --project Golem.Package -- build --target modules --yagna-version pre-rel-v0.16.0-preview.ai.42 --runtime-version v0.2.5 +dotnet run --project Golem.Package -- build --target modules --yagna-version pre-rel-v0.16.0-preview.ai.46 --runtime-version v0.2.5 ``` ## Running From 920fc9368e2ef209bbe30a2dd0c32480dab8223d Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Wed, 11 Sep 2024 15:06:43 +0200 Subject: [PATCH 2/2] Release v5.1.0 --- Golem.Package/Args.cs | 6 +++--- Golem.Tools/GolemPackageBuilder.cs | 4 ++-- MockGUI/readme.md | 4 ++-- example/ai-requestor/ai_runtime.py | 16 +++++++++++++++- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Golem.Package/Args.cs b/Golem.Package/Args.cs index e86fcb5..0465441 100644 --- a/Golem.Package/Args.cs +++ b/Golem.Package/Args.cs @@ -5,9 +5,9 @@ public class BuildArgs { [Option('t', "target", Default = "package", Required = false, HelpText = "Directory where binaries will be generated relative to working dir")] public required string Target { get; set; } - [Option('y', "yagna-version", Default = "pre-rel-v0.16.0-preview.ai.46", Required = false, HelpText = "Yagna version github tag")] + [Option('y', "yagna-version", Default = "pre-rel-v0.16.0-preview.ai.47", Required = false, HelpText = "Yagna version github tag")] public required string GolemVersion { get; set; } - [Option('r', "runtime-version", Default = "pre-rel-v0.2.6-rc2", Required = false, HelpText = "Runtime version github tag")] + [Option('r', "runtime-version", Default = "v0.2.6", Required = false, HelpText = "Runtime version github tag")] public required string RuntimeVersion { get; set; } [Option('c', "dont-clean", Default = false, Required = false, HelpText = "Remove temporary directories")] public required bool DontClean { get; set; } @@ -23,7 +23,7 @@ public class DownloadArgs { [Option('t', "target", Default = "modules", Required = false, HelpText = "Directory where binaries will be generated relative to working dir")] public required string Target { get; set; } - [Option('p', "version", Default = "pre-rel-v5.0.7", Required = false, HelpText = "Gamerhash module integration package version")] + [Option('p', "version", Default = "v5.1.0", Required = false, HelpText = "Gamerhash module integration package version")] public required string PackageVersion { get; set; } } diff --git a/Golem.Tools/GolemPackageBuilder.cs b/Golem.Tools/GolemPackageBuilder.cs index 6e10364..963f094 100644 --- a/Golem.Tools/GolemPackageBuilder.cs +++ b/Golem.Tools/GolemPackageBuilder.cs @@ -18,8 +18,8 @@ namespace Golem.Tools { public class PackageBuilder { - public static string CURRENT_GOLEM_VERSION = "pre-rel-v0.16.0-preview.ai.46"; - public static string CURRENT_RUNTIME_VERSION = "v0.2.5"; + public static string CURRENT_GOLEM_VERSION = "pre-rel-v0.16.0-preview.ai.47"; + public static string CURRENT_RUNTIME_VERSION = "v0.2.6"; internal static string InitTestDirectory(string name, bool cleanupData = true) { diff --git a/MockGUI/readme.md b/MockGUI/readme.md index 837e83a..7216e73 100644 --- a/MockGUI/readme.md +++ b/MockGUI/readme.md @@ -33,13 +33,13 @@ golem data directories. You can choose specific release to be downloaded: ```sh -dotnet run --project Golem.Package -- download --target modules --version pre-rel-v5.0.1 +dotnet run --project Golem.Package -- download --target modules --version v5.0.1 ``` In case of building artifacts locally you can specify `yagna` and `runtimes` versions: ```sh -dotnet run --project Golem.Package -- build --target modules --yagna-version pre-rel-v0.16.0-preview.ai.46 --runtime-version v0.2.5 +dotnet run --project Golem.Package -- build --target modules --yagna-version pre-rel-v0.16.0-preview.ai.47 --runtime-version v0.2.6 ``` ## Running diff --git a/example/ai-requestor/ai_runtime.py b/example/ai-requestor/ai_runtime.py index 6344703..25d1b0c 100644 --- a/example/ai-requestor/ai_runtime.py +++ b/example/ai-requestor/ai_runtime.py @@ -191,12 +191,26 @@ class AiRuntimeService(Service): @staticmethod async def get_payload(): ## TODO switched into using smaller model to avoid problems during tests. Resolve it when automatic runtime integrated - # return AiPayload(image_url="hash:sha3:92180a67d096be309c5e6a7146d89aac4ef900e2bf48a52ea569df7d:https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors?download=true") # return AiPayload(image_url="hash:sha3:0b682cf78786b04dc108ff0b254db1511ef820105129ad021d2e123a7b975e7c:https://huggingface.co/cointegrated/rubert-tiny2/resolve/main/model.safetensors?download=true") + return AiPayload( image_url="hash:sha3:b2da48d618beddab1887739d75b50a3041c810bc73805a416761185998359b24:https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.safetensors?download=true", runtime=AiRuntimeService.runtime, ) + # return AiPayload( + # image_url="hash:sha2:26ebb6db2a68593c54c74902d7a74f332da66297693f965cc9f1b0af4abf3894:https://huggingface.co/cointegrated/rubert-tiny2/resolve/main/model.safetensors?download=true", + # runtime=AiRuntimeService.runtime, + # ) + # return AiPayload( + # image_url="hash:sha3:92180a67d096be309c5e6a7146d89aac4ef900e2bf48a52ea569df7d:https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors?download=true", + # runtime=AiRuntimeService.runtime, + # ) + # return AiPayload( + # image_url="hash:sha2:31e35c80fc4829d14f90153f4c74cd59c90b779f6afe05a74cd6120b893f7e5b:https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors?download=true", + # runtime=AiRuntimeService.runtime, + # ) + + async def start(self): self.strategy.remember(self._ctx.provider_id)