From c7354f14f3e4c1ffb5a8e775e6a45010a3f57b94 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 1 Apr 2025 08:25:01 +0200 Subject: [PATCH 1/2] python312Packages.opentelemetry-instrumentation-httpx: init at 0.50b0 --- .../default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/opentelemetry-instrumentation-httpx/default.nix diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-httpx/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-httpx/default.nix new file mode 100644 index 000000000000..4fe687d399dd --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-httpx/default.nix @@ -0,0 +1,41 @@ +{ + buildPythonPackage, + hatchling, + httpx, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-util-http, + opentelemetry-test-utils, + pytestCheckHook, + respx, +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-httpx"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-httpx"; + + build-system = [ hatchling ]; + + dependencies = [ + httpx + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-util-http + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.httpx" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-httpx"; + description = "Allows tracing HTTP requests made by the httpx library"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ef9e19f4662..d105ed810492 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10291,6 +10291,10 @@ self: super: with self; { callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { }; + opentelemetry-instrumentation-httpx = + callPackage ../development/python-modules/opentelemetry-instrumentation-httpx + { }; + opentelemetry-instrumentation-logging = callPackage ../development/python-modules/opentelemetry-instrumentation-logging { }; From 887c3a0f8c30b0fba13edfc9c76df4590934d1a0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 1 Apr 2025 08:32:09 +0200 Subject: [PATCH 2/2] open-webui: 0.5.20 -> 0.6.0 --- pkgs/by-name/op/open-webui/package.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 73a80c60e6e4..33e72e505215 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -8,13 +8,13 @@ }: let pname = "open-webui"; - version = "0.5.20"; + version = "0.6.0"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-GVUEKAuuLrVTVreEeGcIAsDSOltiQAHmWGM67C5RYt4="; + hash = "sha256-YCob6Tgnpdbt9QqnwakorXGlyaxy4wo2QCp4EMGHTrU="; }; frontend = buildNpmPackage rec { @@ -30,7 +30,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-A84u/IMZX8JlyKXltvQFHZYFXSWPXsx2mr2WwT0Lraw="; + npmDepsHash = "sha256-lWVkZDlPDCmiNMj+7K47wSFwTKRJkS762uGtcBfx59s="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -133,11 +133,23 @@ python312.pkgs.buildPythonApplication rec { opencv-python-headless openpyxl opensearch-py + opentelemetry-api + opentelemetry-sdk + opentelemetry-exporter-otlp + opentelemetry-instrumentation + opentelemetry-instrumentation-fastapi + opentelemetry-instrumentation-sqlalchemy + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-requests + opentelemetry-instrumentation-logging + opentelemetry-instrumentation-httpx + opentelemetry-instrumentation-aiohttp-client pandas passlib peewee peewee-migrate pgvector + pillow playwright psutil psycopg2-binary