From 27c9a50d0eb6c5fe5c08009421cfaac5aed1d886 Mon Sep 17 00:00:00 2001 From: amberjblue Date: Wed, 30 Jul 2025 16:24:30 -0400 Subject: [PATCH 01/10] Update common package directory --- detectors/built_in/app.py | 4 +- detectors/built_in/base_detector_registry.py | 2 +- detectors/built_in/file_type_detectors.py | 2 +- detectors/built_in/regex_detectors.py | 2 +- detectors/common/LICENSE | 201 ++++++++++++++++++ detectors/common/README.md | 21 ++ detectors/common/__init__.py | 0 detectors/common/pyproject.toml | 62 ++++++ .../guardrails_detectors_common/__init__.py | 52 +++++ .../guardrails_detectors_common}/app.py | 2 - .../log_conf.yaml | 0 .../requirements-dev.txt | 0 .../requirements.txt | 0 .../guardrails_detectors_common}/scheme.py | 0 detectors/huggingface/app.py | 9 +- detectors/huggingface/detector.py | 7 +- detectors/llm_judge/app.py | 2 +- detectors/llm_judge/detector.py | 2 +- 18 files changed, 348 insertions(+), 20 deletions(-) create mode 100644 detectors/common/LICENSE create mode 100644 detectors/common/README.md delete mode 100644 detectors/common/__init__.py create mode 100644 detectors/common/pyproject.toml create mode 100644 detectors/common/src/guardrails_detectors_common/__init__.py rename detectors/common/{ => src/guardrails_detectors_common}/app.py (99%) rename detectors/common/{ => src/guardrails_detectors_common}/log_conf.yaml (100%) rename detectors/common/{ => src/guardrails_detectors_common}/requirements-dev.txt (100%) rename detectors/common/{ => src/guardrails_detectors_common}/requirements.txt (100%) rename detectors/common/{ => src/guardrails_detectors_common}/scheme.py (100%) diff --git a/detectors/built_in/app.py b/detectors/built_in/app.py index 9ec7fca..5196641 100644 --- a/detectors/built_in/app.py +++ b/detectors/built_in/app.py @@ -5,8 +5,8 @@ from file_type_detectors import FileTypeDetectorRegistry from prometheus_fastapi_instrumentator import Instrumentator -from detectors.common.scheme import ContentAnalysisHttpRequest, ContentsAnalysisResponse -from detectors.common.app import DetectorBaseAPI as FastAPI +from guardrails_detectors_common import ContentAnalysisHttpRequest, ContentsAnalysisResponse +from guardrails_detectors_common import DetectorBaseAPI as FastAPI @asynccontextmanager async def lifespan(app: FastAPI): diff --git a/detectors/built_in/base_detector_registry.py b/detectors/built_in/base_detector_registry.py index 8ece51a..9352f34 100644 --- a/detectors/built_in/base_detector_registry.py +++ b/detectors/built_in/base_detector_registry.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod from typing import List -from detectors.common.scheme import ContentAnalysisResponse +from guardrails_detectors_common import ContentAnalysisResponse class BaseDetectorRegistry(ABC): def __init__(self): diff --git a/detectors/built_in/file_type_detectors.py b/detectors/built_in/file_type_detectors.py index 58de98d..41bbc06 100644 --- a/detectors/built_in/file_type_detectors.py +++ b/detectors/built_in/file_type_detectors.py @@ -9,7 +9,7 @@ from typing import List, Optional from base_detector_registry import BaseDetectorRegistry -from detectors.common.scheme import ContentAnalysisResponse +from guardrails_detectors_common import ContentAnalysisResponse def is_valid_json(s: str) -> Optional[ContentAnalysisResponse]: diff --git a/detectors/built_in/regex_detectors.py b/detectors/built_in/regex_detectors.py index f4a1b6d..a692ded 100644 --- a/detectors/built_in/regex_detectors.py +++ b/detectors/built_in/regex_detectors.py @@ -2,7 +2,7 @@ from http.client import HTTPException from typing import List from base_detector_registry import BaseDetectorRegistry -from detectors.common.scheme import ContentAnalysisResponse +from guardrails_detectors_common import ContentAnalysisResponse def email_address_detector(string: str) -> List[ContentAnalysisResponse]: diff --git a/detectors/common/LICENSE b/detectors/common/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/detectors/common/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/detectors/common/README.md b/detectors/common/README.md new file mode 100644 index 0000000..f508edb --- /dev/null +++ b/detectors/common/README.md @@ -0,0 +1,21 @@ +# Guardrails Detectors Common + +Common utilities and base classes for guardrails detector packages. + +## Overview + +This package provides components used by all guardrails detector packages: + +- **FastAPI Base Classes**: `DetectorBaseAPI` for creating detector web services +- **Logging**: Configured logger instance for consistent logging across detectors +- **Data Models**: Shared Pydantic models for request/response schemas + +## Installation + +```bash +pip install guardrails-detectors-common +``` + +## License + +Apache-2.0 \ No newline at end of file diff --git a/detectors/common/__init__.py b/detectors/common/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/detectors/common/pyproject.toml b/detectors/common/pyproject.toml new file mode 100644 index 0000000..93021e2 --- /dev/null +++ b/detectors/common/pyproject.toml @@ -0,0 +1,62 @@ +[project] +name = "guardrails-detectors-common" +version = "0.1.1" +description = "Common utilities and base classes for guardrails detectors" +readme = "README.md" +requires-python = ">=3.9" +license = { text = "Apache-2.0" } +authors = [ + {name = "Mac Misiura", email = "mmisiura@redhat.com"}, + {name = "Rob Geada", email = "rgeada@redhat.com"}, + {name = "Rui Vieira", email = "rcardoso@redhat.com"}, + {name = "Sai Chandra", email = "spandraj@redhat.com"}, + {name = "TrustyAI team"} +] +classifiers = [ + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "License :: OSI Approved :: Apache Software License", + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "Intended Audience :: Science/Research", + "Topic :: Scientific/Engineering :: Artificial Intelligence", + "Topic :: Software Development :: Libraries :: Python Modules", +] +keywords = ["AI", "LLM", "Guardrails", "Detectors", "Responsible AI", "TrustyAI"] + +dependencies = [ + "fastapi>=0.112.0", + "uvicorn>=0.30.5", + "httpx>=0.27.0", + "prometheus-client>=0.18.0", + "prometheus-fastapi-instrumentator>=7.0.0", + "PyYAML>=6.0.2", + "pydantic>=2.0.0", +] + +[project.optional-dependencies] +dev = [ + "build", + "pytest>=8.3.2", + "pre-commit>=3.8.0", +] + +[project.urls] +Homepage = "https://github.com/trustyai-explainability/guardrails-detectors" +Repository = "https://github.com/trustyai-explainability/guardrails-detectors.git" +Issues = "https://github.com/trustyai-explainability/guardrails-detectors/issues" + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.hatch.build.targets.wheel] +packages = ["src/guardrails_detectors_common"] + +[tool.hatch.build.targets.sdist] +include = [ + "src/", + "pyproject.toml", + "README.md", + "LICENSE" +] \ No newline at end of file diff --git a/detectors/common/src/guardrails_detectors_common/__init__.py b/detectors/common/src/guardrails_detectors_common/__init__.py new file mode 100644 index 0000000..4fcdebb --- /dev/null +++ b/detectors/common/src/guardrails_detectors_common/__init__.py @@ -0,0 +1,52 @@ +""" +Guardrails Detectors Common +""" + +from .app import DetectorBaseAPI, logger +from .scheme import ( + RoleEnum, + Message, + TextDetectionHttpRequest, + TextDetectionResponse, + GenerationDetectionHttpRequest, + GenerationDetectionResponse, + ChatDetectionHttpRequest, + ContextBasedDetectionHttpRequest, + AttributionBasedDetectionResponse, + DetectionHttpRequest, + DetectionResponseSpan, + DetectionResponse, + Evidence, + EvidenceType, + EvidenceObj, + ContentAnalysisHttpRequest, + ContentAnalysisResponse, + ContentsAnalysisResponse, + Error, +) + +__version__ = "0.1.0" + +__all__ = [ + "DetectorBaseAPI", + "logger", + "RoleEnum", + "Message", + "TextDetectionHttpRequest", + "TextDetectionResponse", + "GenerationDetectionHttpRequest", + "GenerationDetectionResponse", + "ChatDetectionHttpRequest", + "ContextBasedDetectionHttpRequest", + "AttributionBasedDetectionResponse", + "DetectionHttpRequest", + "DetectionResponseSpan", + "DetectionResponse", + "Evidence", + "EvidenceType", + "EvidenceObj", + "ContentAnalysisHttpRequest", + "ContentAnalysisResponse", + "ContentsAnalysisResponse", + "Error", +] diff --git a/detectors/common/app.py b/detectors/common/src/guardrails_detectors_common/app.py similarity index 99% rename from detectors/common/app.py rename to detectors/common/src/guardrails_detectors_common/app.py index 0ae8e23..216ecd8 100644 --- a/detectors/common/app.py +++ b/detectors/common/src/guardrails_detectors_common/app.py @@ -8,8 +8,6 @@ from fastapi.exceptions import RequestValidationError from fastapi.responses import JSONResponse -sys.path.insert(0, os.path.abspath("..")) - import logging from fastapi import FastAPI, status diff --git a/detectors/common/log_conf.yaml b/detectors/common/src/guardrails_detectors_common/log_conf.yaml similarity index 100% rename from detectors/common/log_conf.yaml rename to detectors/common/src/guardrails_detectors_common/log_conf.yaml diff --git a/detectors/common/requirements-dev.txt b/detectors/common/src/guardrails_detectors_common/requirements-dev.txt similarity index 100% rename from detectors/common/requirements-dev.txt rename to detectors/common/src/guardrails_detectors_common/requirements-dev.txt diff --git a/detectors/common/requirements.txt b/detectors/common/src/guardrails_detectors_common/requirements.txt similarity index 100% rename from detectors/common/requirements.txt rename to detectors/common/src/guardrails_detectors_common/requirements.txt diff --git a/detectors/common/scheme.py b/detectors/common/src/guardrails_detectors_common/scheme.py similarity index 100% rename from detectors/common/scheme.py rename to detectors/common/src/guardrails_detectors_common/scheme.py diff --git a/detectors/huggingface/app.py b/detectors/huggingface/app.py index 8ff1213..98cdcb8 100644 --- a/detectors/huggingface/app.py +++ b/detectors/huggingface/app.py @@ -1,15 +1,12 @@ -import os -import sys from contextlib import asynccontextmanager from typing import Annotated from fastapi import Header from prometheus_fastapi_instrumentator import Instrumentator -sys.path.insert(0, os.path.abspath("..")) -from common.app import DetectorBaseAPI as FastAPI -from detector import Detector -from scheme import ( +from guardrails_detectors_common import DetectorBaseAPI as FastAPI +from .detector import Detector +from .scheme import ( ContentAnalysisHttpRequest, ContentsAnalysisResponse, Error, diff --git a/detectors/huggingface/detector.py b/detectors/huggingface/detector.py index b6b070f..75e11a1 100644 --- a/detectors/huggingface/detector.py +++ b/detectors/huggingface/detector.py @@ -1,7 +1,4 @@ import os -import sys - -sys.path.insert(0, os.path.abspath("..")) import math import torch from transformers import ( @@ -10,8 +7,8 @@ AutoModelForSequenceClassification, AutoModelForCausalLM, ) -from common.app import logger -from scheme import ( +from guardrails_detectors_common import logger +from .scheme import ( ContentAnalysisHttpRequest, ContentAnalysisResponse, ContentsAnalysisResponse, diff --git a/detectors/llm_judge/app.py b/detectors/llm_judge/app.py index 1eb7d0c..19cd64a 100644 --- a/detectors/llm_judge/app.py +++ b/detectors/llm_judge/app.py @@ -4,7 +4,7 @@ from fastapi import Header, HTTPException from prometheus_fastapi_instrumentator import Instrumentator -from detectors.common.app import DetectorBaseAPI as FastAPI +from guardrails_detectors_common import DetectorBaseAPI as FastAPI from detectors.llm_judge.detector import LLMJudgeDetector from detectors.llm_judge.scheme import ( ContentAnalysisHttpRequest, diff --git a/detectors/llm_judge/detector.py b/detectors/llm_judge/detector.py index 823a2f7..9ae00a1 100644 --- a/detectors/llm_judge/detector.py +++ b/detectors/llm_judge/detector.py @@ -3,7 +3,7 @@ from vllm_judge import Judge, EvaluationResult, BUILTIN_METRICS from vllm_judge.exceptions import MetricNotFoundError -from detectors.common.app import logger +from guardrails_detectors_common import logger from detectors.llm_judge.scheme import ( ContentAnalysisHttpRequest, ContentAnalysisResponse, From 4af32da25c6b12ad4455a91cc0e725bc2cb105e9 Mon Sep 17 00:00:00 2001 From: amberjblue Date: Wed, 30 Jul 2025 16:46:12 -0400 Subject: [PATCH 02/10] update requirements --- detectors/built_in/requirements-dev.txt | 4 ++++ detectors/built_in/requirements.txt | 3 ++- .../guardrails_detectors_common => }/requirements-dev.txt | 0 .../{src/guardrails_detectors_common => }/requirements.txt | 0 detectors/huggingface/requirements-dev.txt | 2 ++ detectors/huggingface/requirements.txt | 1 + llm_judge/requirements-dev.txt | 3 +++ llm_judge/requirements.txt | 3 +++ 8 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 detectors/built_in/requirements-dev.txt rename detectors/common/{src/guardrails_detectors_common => }/requirements-dev.txt (100%) rename detectors/common/{src/guardrails_detectors_common => }/requirements.txt (100%) create mode 100644 detectors/huggingface/requirements-dev.txt create mode 100644 llm_judge/requirements-dev.txt create mode 100644 llm_judge/requirements.txt diff --git a/detectors/built_in/requirements-dev.txt b/detectors/built_in/requirements-dev.txt new file mode 100644 index 0000000..5172860 --- /dev/null +++ b/detectors/built_in/requirements-dev.txt @@ -0,0 +1,4 @@ +-e ../common/ +markdown==3.8.2 +jsonschema==4.24.0 +xmlschema==4.1.0 \ No newline at end of file diff --git a/detectors/built_in/requirements.txt b/detectors/built_in/requirements.txt index 31144c9..4b7f686 100644 --- a/detectors/built_in/requirements.txt +++ b/detectors/built_in/requirements.txt @@ -1,3 +1,4 @@ markdown==3.8.2 jsonschema==4.24.0 -xmlschema==4.1.0 \ No newline at end of file +xmlschema==4.1.0 +guardrails-detectors-common>=0.1.1 \ No newline at end of file diff --git a/detectors/common/src/guardrails_detectors_common/requirements-dev.txt b/detectors/common/requirements-dev.txt similarity index 100% rename from detectors/common/src/guardrails_detectors_common/requirements-dev.txt rename to detectors/common/requirements-dev.txt diff --git a/detectors/common/src/guardrails_detectors_common/requirements.txt b/detectors/common/requirements.txt similarity index 100% rename from detectors/common/src/guardrails_detectors_common/requirements.txt rename to detectors/common/requirements.txt diff --git a/detectors/huggingface/requirements-dev.txt b/detectors/huggingface/requirements-dev.txt new file mode 100644 index 0000000..a67abed --- /dev/null +++ b/detectors/huggingface/requirements-dev.txt @@ -0,0 +1,2 @@ +-e ../common/ +transformers==4.50.0 diff --git a/detectors/huggingface/requirements.txt b/detectors/huggingface/requirements.txt index 20d5940..0f7688a 100644 --- a/detectors/huggingface/requirements.txt +++ b/detectors/huggingface/requirements.txt @@ -1 +1,2 @@ transformers==4.50.0 +guardrails-detectors-common>=0.1.1 diff --git a/llm_judge/requirements-dev.txt b/llm_judge/requirements-dev.txt new file mode 100644 index 0000000..136cc89 --- /dev/null +++ b/llm_judge/requirements-dev.txt @@ -0,0 +1,3 @@ +-e ../common/ +vllm-judge[jinja2]==0.1.6 +pyyaml==6.0.2 \ No newline at end of file diff --git a/llm_judge/requirements.txt b/llm_judge/requirements.txt new file mode 100644 index 0000000..3af2521 --- /dev/null +++ b/llm_judge/requirements.txt @@ -0,0 +1,3 @@ +vllm-judge[jinja2]==0.1.6 +pyyaml==6.0.2 +guardrails-detectors-common>=0.1.1 \ No newline at end of file From f844f3297c877c91b8ccaa484288ab361eec7a36 Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 08:37:56 -0400 Subject: [PATCH 03/10] Reorganize hf detector --- .gitignore | 4 +- detectors/huggingface/LICENSE | 201 ++++++++++++++++++ detectors/huggingface/__init__.py | 0 detectors/huggingface/pyproject.toml | 59 +++++ .../__init__.py | 23 ++ .../guardrails_detectors_huggingface}/app.py | 0 .../detector.py | 0 .../scheme.py | 0 .../llm_judge}/requirements-dev.txt | 0 detectors/llm_judge/requirements.txt | 3 +- llm_judge/requirements.txt | 3 - 11 files changed, 288 insertions(+), 5 deletions(-) create mode 100644 detectors/huggingface/LICENSE delete mode 100644 detectors/huggingface/__init__.py create mode 100644 detectors/huggingface/pyproject.toml create mode 100644 detectors/huggingface/src/guardrails_detectors_huggingface/__init__.py rename detectors/huggingface/{ => src/guardrails_detectors_huggingface}/app.py (100%) rename detectors/huggingface/{ => src/guardrails_detectors_huggingface}/detector.py (100%) rename detectors/huggingface/{ => src/guardrails_detectors_huggingface}/scheme.py (100%) rename {llm_judge => detectors/llm_judge}/requirements-dev.txt (100%) delete mode 100644 llm_judge/requirements.txt diff --git a/.gitignore b/.gitignore index b36b383..0ed34a3 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,6 @@ __pycache__/ .coverage # .vscode -.vscode/ \ No newline at end of file +.vscode/ + +dist/ \ No newline at end of file diff --git a/detectors/huggingface/LICENSE b/detectors/huggingface/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/detectors/huggingface/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/detectors/huggingface/__init__.py b/detectors/huggingface/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/detectors/huggingface/pyproject.toml b/detectors/huggingface/pyproject.toml new file mode 100644 index 0000000..4603b1c --- /dev/null +++ b/detectors/huggingface/pyproject.toml @@ -0,0 +1,59 @@ +[project] +name = "guardrails-detector-huggingface" +version = "0.1.0" +description = "Huggingface detector implementation for guardrails" +readme = "README.md" +requires-python = ">=3.9" +license = { text = "Apache-2.0" } +authors = [ + {name = "Mac Misiura", email = "mmisiura@redhat.com"}, + {name = "Rob Geada", email = "rgeada@redhat.com"}, + {name = "Rui Vieira", email = "rcardoso@redhat.com"}, + {name = "Sai Chandra", email = "spandraj@redhat.com"}, + {name = "TrustyAI team"} +] +classifiers = [ + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "License :: OSI Approved :: Apache Software License", + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "Intended Audience :: Science/Research", + "Topic :: Scientific/Engineering :: Artificial Intelligence", + "Topic :: Software Development :: Libraries :: Python Modules", +] +keywords = ["AI", "LLM", "Guardrails", "Detectors", "Responsible AI", "TrustyAI", "Huggingface", "Transformers"] +dependencies = [ + "guardrails-detectors-common>=0.1.1", + "transformers>=4.50.0", + "torch>=1.13.0", +] + +[project.optional-dependencies] +dev = [ + "build", + "pytest>=8.3.2", + "pre-commit>=3.8.0", +] + +[project.urls] +Homepage = "https://github.com/trustyai-explainability/guardrails-detectors" +Repository = "https://github.com/trustyai-explainability/guardrails-detectors.git" +Issues = "https://github.com/trustyai-explainability/guardrails-detectors/issues" + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.hatch.build.targets.wheel] +packages = ["src/guardrails_detector_huggingface"] + +[tool.hatch.build.targets.sdist] +include = [ + "src/", + "pyproject.toml", + "README.md", + "LICENSE" +] diff --git a/detectors/huggingface/src/guardrails_detectors_huggingface/__init__.py b/detectors/huggingface/src/guardrails_detectors_huggingface/__init__.py new file mode 100644 index 0000000..b48224a --- /dev/null +++ b/detectors/huggingface/src/guardrails_detectors_huggingface/__init__.py @@ -0,0 +1,23 @@ +""" +Huggingface Guardrails Detector +""" + +from .detector import Detector +from .app import app +from .scheme import ( + ContentAnalysisHttpRequest, + ContentAnalysisResponse, + ContentsAnalysisResponse, + Error, +) + +__version__ = "0.1.0" + +__all__ = [ + "Detector", + "app", + "ContentAnalysisHttpRequest", + "ContentAnalysisResponse", + "ContentsAnalysisResponse", + "Error", +] diff --git a/detectors/huggingface/app.py b/detectors/huggingface/src/guardrails_detectors_huggingface/app.py similarity index 100% rename from detectors/huggingface/app.py rename to detectors/huggingface/src/guardrails_detectors_huggingface/app.py diff --git a/detectors/huggingface/detector.py b/detectors/huggingface/src/guardrails_detectors_huggingface/detector.py similarity index 100% rename from detectors/huggingface/detector.py rename to detectors/huggingface/src/guardrails_detectors_huggingface/detector.py diff --git a/detectors/huggingface/scheme.py b/detectors/huggingface/src/guardrails_detectors_huggingface/scheme.py similarity index 100% rename from detectors/huggingface/scheme.py rename to detectors/huggingface/src/guardrails_detectors_huggingface/scheme.py diff --git a/llm_judge/requirements-dev.txt b/detectors/llm_judge/requirements-dev.txt similarity index 100% rename from llm_judge/requirements-dev.txt rename to detectors/llm_judge/requirements-dev.txt diff --git a/detectors/llm_judge/requirements.txt b/detectors/llm_judge/requirements.txt index ac1cc6c..3af2521 100644 --- a/detectors/llm_judge/requirements.txt +++ b/detectors/llm_judge/requirements.txt @@ -1,2 +1,3 @@ vllm-judge[jinja2]==0.1.6 -pyyaml==6.0.2 \ No newline at end of file +pyyaml==6.0.2 +guardrails-detectors-common>=0.1.1 \ No newline at end of file diff --git a/llm_judge/requirements.txt b/llm_judge/requirements.txt deleted file mode 100644 index 3af2521..0000000 --- a/llm_judge/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -vllm-judge[jinja2]==0.1.6 -pyyaml==6.0.2 -guardrails-detectors-common>=0.1.1 \ No newline at end of file From ec15895aef407c958a9616016dd68cca2ab92f9f Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 08:48:59 -0400 Subject: [PATCH 04/10] Update package name and version --- detectors/built_in/app.py | 4 ++-- detectors/built_in/base_detector_registry.py | 2 +- detectors/built_in/file_type_detectors.py | 2 +- detectors/built_in/regex_detectors.py | 2 +- detectors/built_in/requirements.txt | 2 +- detectors/common/README.md | 2 +- detectors/common/pyproject.toml | 6 +++--- .../__init__.py | 0 .../app.py | 0 .../log_conf.yaml | 0 .../scheme.py | 0 detectors/huggingface/pyproject.toml | 2 +- detectors/huggingface/requirements.txt | 2 +- .../__init__.py | 0 .../app.py | 2 +- .../detector.py | 2 +- .../scheme.py | 0 detectors/llm_judge/app.py | 2 +- detectors/llm_judge/detector.py | 2 +- detectors/llm_judge/requirements.txt | 2 +- 20 files changed, 17 insertions(+), 17 deletions(-) rename detectors/common/src/{guardrails_detectors_common => guardrails_detector_common}/__init__.py (100%) rename detectors/common/src/{guardrails_detectors_common => guardrails_detector_common}/app.py (100%) rename detectors/common/src/{guardrails_detectors_common => guardrails_detector_common}/log_conf.yaml (100%) rename detectors/common/src/{guardrails_detectors_common => guardrails_detector_common}/scheme.py (100%) rename detectors/huggingface/src/{guardrails_detectors_huggingface => guardrails_detector_huggingface}/__init__.py (100%) rename detectors/huggingface/src/{guardrails_detectors_huggingface => guardrails_detector_huggingface}/app.py (95%) rename detectors/huggingface/src/{guardrails_detectors_huggingface => guardrails_detector_huggingface}/detector.py (99%) rename detectors/huggingface/src/{guardrails_detectors_huggingface => guardrails_detector_huggingface}/scheme.py (100%) diff --git a/detectors/built_in/app.py b/detectors/built_in/app.py index 5196641..357b9d5 100644 --- a/detectors/built_in/app.py +++ b/detectors/built_in/app.py @@ -5,8 +5,8 @@ from file_type_detectors import FileTypeDetectorRegistry from prometheus_fastapi_instrumentator import Instrumentator -from guardrails_detectors_common import ContentAnalysisHttpRequest, ContentsAnalysisResponse -from guardrails_detectors_common import DetectorBaseAPI as FastAPI +from guardrails_detector_common import ContentAnalysisHttpRequest, ContentsAnalysisResponse +from guardrails_detector_common import DetectorBaseAPI as FastAPI @asynccontextmanager async def lifespan(app: FastAPI): diff --git a/detectors/built_in/base_detector_registry.py b/detectors/built_in/base_detector_registry.py index 9352f34..2a6c7e7 100644 --- a/detectors/built_in/base_detector_registry.py +++ b/detectors/built_in/base_detector_registry.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod from typing import List -from guardrails_detectors_common import ContentAnalysisResponse +from guardrails_detector_common import ContentAnalysisResponse class BaseDetectorRegistry(ABC): def __init__(self): diff --git a/detectors/built_in/file_type_detectors.py b/detectors/built_in/file_type_detectors.py index 41bbc06..2592cce 100644 --- a/detectors/built_in/file_type_detectors.py +++ b/detectors/built_in/file_type_detectors.py @@ -9,7 +9,7 @@ from typing import List, Optional from base_detector_registry import BaseDetectorRegistry -from guardrails_detectors_common import ContentAnalysisResponse +from guardrails_detector_common import ContentAnalysisResponse def is_valid_json(s: str) -> Optional[ContentAnalysisResponse]: diff --git a/detectors/built_in/regex_detectors.py b/detectors/built_in/regex_detectors.py index a692ded..5e9229f 100644 --- a/detectors/built_in/regex_detectors.py +++ b/detectors/built_in/regex_detectors.py @@ -2,7 +2,7 @@ from http.client import HTTPException from typing import List from base_detector_registry import BaseDetectorRegistry -from guardrails_detectors_common import ContentAnalysisResponse +from guardrails_detector_common import ContentAnalysisResponse def email_address_detector(string: str) -> List[ContentAnalysisResponse]: diff --git a/detectors/built_in/requirements.txt b/detectors/built_in/requirements.txt index 4b7f686..6283b35 100644 --- a/detectors/built_in/requirements.txt +++ b/detectors/built_in/requirements.txt @@ -1,4 +1,4 @@ markdown==3.8.2 jsonschema==4.24.0 xmlschema==4.1.0 -guardrails-detectors-common>=0.1.1 \ No newline at end of file +guardrails-detector-common>=0.1.0 \ No newline at end of file diff --git a/detectors/common/README.md b/detectors/common/README.md index f508edb..a8b006e 100644 --- a/detectors/common/README.md +++ b/detectors/common/README.md @@ -13,7 +13,7 @@ This package provides components used by all guardrails detector packages: ## Installation ```bash -pip install guardrails-detectors-common +pip install guardrails-detector-common ``` ## License diff --git a/detectors/common/pyproject.toml b/detectors/common/pyproject.toml index 93021e2..89d085a 100644 --- a/detectors/common/pyproject.toml +++ b/detectors/common/pyproject.toml @@ -1,6 +1,6 @@ [project] -name = "guardrails-detectors-common" -version = "0.1.1" +name = "guardrails-detector-common" +version = "0.1.0" description = "Common utilities and base classes for guardrails detectors" readme = "README.md" requires-python = ">=3.9" @@ -51,7 +51,7 @@ requires = ["hatchling"] build-backend = "hatchling.build" [tool.hatch.build.targets.wheel] -packages = ["src/guardrails_detectors_common"] +packages = ["src/guardrails_detector_common"] [tool.hatch.build.targets.sdist] include = [ diff --git a/detectors/common/src/guardrails_detectors_common/__init__.py b/detectors/common/src/guardrails_detector_common/__init__.py similarity index 100% rename from detectors/common/src/guardrails_detectors_common/__init__.py rename to detectors/common/src/guardrails_detector_common/__init__.py diff --git a/detectors/common/src/guardrails_detectors_common/app.py b/detectors/common/src/guardrails_detector_common/app.py similarity index 100% rename from detectors/common/src/guardrails_detectors_common/app.py rename to detectors/common/src/guardrails_detector_common/app.py diff --git a/detectors/common/src/guardrails_detectors_common/log_conf.yaml b/detectors/common/src/guardrails_detector_common/log_conf.yaml similarity index 100% rename from detectors/common/src/guardrails_detectors_common/log_conf.yaml rename to detectors/common/src/guardrails_detector_common/log_conf.yaml diff --git a/detectors/common/src/guardrails_detectors_common/scheme.py b/detectors/common/src/guardrails_detector_common/scheme.py similarity index 100% rename from detectors/common/src/guardrails_detectors_common/scheme.py rename to detectors/common/src/guardrails_detector_common/scheme.py diff --git a/detectors/huggingface/pyproject.toml b/detectors/huggingface/pyproject.toml index 4603b1c..b6fa8e7 100644 --- a/detectors/huggingface/pyproject.toml +++ b/detectors/huggingface/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] keywords = ["AI", "LLM", "Guardrails", "Detectors", "Responsible AI", "TrustyAI", "Huggingface", "Transformers"] dependencies = [ - "guardrails-detectors-common>=0.1.1", + "guardrails-detector-common>=0.1.1", "transformers>=4.50.0", "torch>=1.13.0", ] diff --git a/detectors/huggingface/requirements.txt b/detectors/huggingface/requirements.txt index 0f7688a..6b3b606 100644 --- a/detectors/huggingface/requirements.txt +++ b/detectors/huggingface/requirements.txt @@ -1,2 +1,2 @@ transformers==4.50.0 -guardrails-detectors-common>=0.1.1 +guardrails-detector-common>=0.1.0 diff --git a/detectors/huggingface/src/guardrails_detectors_huggingface/__init__.py b/detectors/huggingface/src/guardrails_detector_huggingface/__init__.py similarity index 100% rename from detectors/huggingface/src/guardrails_detectors_huggingface/__init__.py rename to detectors/huggingface/src/guardrails_detector_huggingface/__init__.py diff --git a/detectors/huggingface/src/guardrails_detectors_huggingface/app.py b/detectors/huggingface/src/guardrails_detector_huggingface/app.py similarity index 95% rename from detectors/huggingface/src/guardrails_detectors_huggingface/app.py rename to detectors/huggingface/src/guardrails_detector_huggingface/app.py index 98cdcb8..186924b 100644 --- a/detectors/huggingface/src/guardrails_detectors_huggingface/app.py +++ b/detectors/huggingface/src/guardrails_detector_huggingface/app.py @@ -4,7 +4,7 @@ from fastapi import Header from prometheus_fastapi_instrumentator import Instrumentator -from guardrails_detectors_common import DetectorBaseAPI as FastAPI +from guardrails_detector_common import DetectorBaseAPI as FastAPI from .detector import Detector from .scheme import ( ContentAnalysisHttpRequest, diff --git a/detectors/huggingface/src/guardrails_detectors_huggingface/detector.py b/detectors/huggingface/src/guardrails_detector_huggingface/detector.py similarity index 99% rename from detectors/huggingface/src/guardrails_detectors_huggingface/detector.py rename to detectors/huggingface/src/guardrails_detector_huggingface/detector.py index 75e11a1..57848d7 100644 --- a/detectors/huggingface/src/guardrails_detectors_huggingface/detector.py +++ b/detectors/huggingface/src/guardrails_detector_huggingface/detector.py @@ -7,7 +7,7 @@ AutoModelForSequenceClassification, AutoModelForCausalLM, ) -from guardrails_detectors_common import logger +from guardrails_detector_common import logger from .scheme import ( ContentAnalysisHttpRequest, ContentAnalysisResponse, diff --git a/detectors/huggingface/src/guardrails_detectors_huggingface/scheme.py b/detectors/huggingface/src/guardrails_detector_huggingface/scheme.py similarity index 100% rename from detectors/huggingface/src/guardrails_detectors_huggingface/scheme.py rename to detectors/huggingface/src/guardrails_detector_huggingface/scheme.py diff --git a/detectors/llm_judge/app.py b/detectors/llm_judge/app.py index 19cd64a..2e387d2 100644 --- a/detectors/llm_judge/app.py +++ b/detectors/llm_judge/app.py @@ -4,7 +4,7 @@ from fastapi import Header, HTTPException from prometheus_fastapi_instrumentator import Instrumentator -from guardrails_detectors_common import DetectorBaseAPI as FastAPI +from guardrails_detector_common import DetectorBaseAPI as FastAPI from detectors.llm_judge.detector import LLMJudgeDetector from detectors.llm_judge.scheme import ( ContentAnalysisHttpRequest, diff --git a/detectors/llm_judge/detector.py b/detectors/llm_judge/detector.py index 9ae00a1..27d2de4 100644 --- a/detectors/llm_judge/detector.py +++ b/detectors/llm_judge/detector.py @@ -3,7 +3,7 @@ from vllm_judge import Judge, EvaluationResult, BUILTIN_METRICS from vllm_judge.exceptions import MetricNotFoundError -from guardrails_detectors_common import logger +from guardrails_detector_common import logger from detectors.llm_judge.scheme import ( ContentAnalysisHttpRequest, ContentAnalysisResponse, diff --git a/detectors/llm_judge/requirements.txt b/detectors/llm_judge/requirements.txt index 3af2521..7a89d71 100644 --- a/detectors/llm_judge/requirements.txt +++ b/detectors/llm_judge/requirements.txt @@ -1,3 +1,3 @@ vllm-judge[jinja2]==0.1.6 pyyaml==6.0.2 -guardrails-detectors-common>=0.1.1 \ No newline at end of file +guardrails-detector-common>=0.1.0 \ No newline at end of file From d1968ca6f0ef823d0838ec0aef84061fa02e57fe Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 08:49:58 -0400 Subject: [PATCH 05/10] Missed version in pyproject.toml --- detectors/huggingface/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detectors/huggingface/pyproject.toml b/detectors/huggingface/pyproject.toml index b6fa8e7..7390c5d 100644 --- a/detectors/huggingface/pyproject.toml +++ b/detectors/huggingface/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] keywords = ["AI", "LLM", "Guardrails", "Detectors", "Responsible AI", "TrustyAI", "Huggingface", "Transformers"] dependencies = [ - "guardrails-detector-common>=0.1.1", + "guardrails-detector-common>=0.1.0", "transformers>=4.50.0", "torch>=1.13.0", ] From 164f0b7fc85cd7cdd8def6f6086fe964daf130b6 Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 08:54:58 -0400 Subject: [PATCH 06/10] Update pyproject.toml --- detectors/huggingface/log_conf.yaml | 33 ++++++++++++++++++++++++++++ detectors/huggingface/pyproject.toml | 2 -- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 detectors/huggingface/log_conf.yaml diff --git a/detectors/huggingface/log_conf.yaml b/detectors/huggingface/log_conf.yaml new file mode 100644 index 0000000..9761bed --- /dev/null +++ b/detectors/huggingface/log_conf.yaml @@ -0,0 +1,33 @@ +version: 1 +disable_existing_loggers: False +formatters: + default: + format: '%(asctime)s - %(name)s - %(levelname)s - %(message)s' + access: + # "()": uvicorn.logging.AccessFormatter + format: '%(asctime)s - %(name)s - %(levelname)s - %(message)s' +handlers: + default: + formatter: default + class: logging.StreamHandler + stream: ext://sys.stderr + access: + formatter: access + class: logging.StreamHandler + stream: ext://sys.stdout +loggers: + uvicorn.error: + level: INFO + handlers: + - default + propagate: no + uvicorn.access: + level: INFO + handlers: + - access + propagate: no +root: + level: DEBUG + handlers: + - default + propagate: no \ No newline at end of file diff --git a/detectors/huggingface/pyproject.toml b/detectors/huggingface/pyproject.toml index 7390c5d..f4fe459 100644 --- a/detectors/huggingface/pyproject.toml +++ b/detectors/huggingface/pyproject.toml @@ -15,8 +15,6 @@ authors = [ classifiers = [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "License :: OSI Approved :: Apache Software License", "Development Status :: 3 - Alpha", "Intended Audience :: Developers", From d876dd6b8a53d92c534e6840a5831307bd0f5a6d Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 08:55:18 -0400 Subject: [PATCH 07/10] Update pyproject.toml --- detectors/huggingface/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detectors/huggingface/pyproject.toml b/detectors/huggingface/pyproject.toml index f4fe459..e987d4a 100644 --- a/detectors/huggingface/pyproject.toml +++ b/detectors/huggingface/pyproject.toml @@ -22,7 +22,7 @@ classifiers = [ "Topic :: Scientific/Engineering :: Artificial Intelligence", "Topic :: Software Development :: Libraries :: Python Modules", ] -keywords = ["AI", "LLM", "Guardrails", "Detectors", "Responsible AI", "TrustyAI", "Huggingface", "Transformers"] +keywords = ["AI", "LLM", "Guardrails", "Responsible AI", "TrustyAI", "Huggingface", "Transformers"] dependencies = [ "guardrails-detector-common>=0.1.0", "transformers>=4.50.0", From 4bb026ce6162377537b5c980c599f900d13119a1 Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 08:57:42 -0400 Subject: [PATCH 08/10] Update pyproject.toml --- detectors/huggingface/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detectors/huggingface/pyproject.toml b/detectors/huggingface/pyproject.toml index e987d4a..d597620 100644 --- a/detectors/huggingface/pyproject.toml +++ b/detectors/huggingface/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "guardrails-detector-huggingface" -version = "0.1.0" +version = "0.1.1" description = "Huggingface detector implementation for guardrails" readme = "README.md" requires-python = ">=3.9" From 3955709c155b2f68154001cbb6681b41cf0a424b Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 09:00:17 -0400 Subject: [PATCH 09/10] remove log_conf.yaml --- detectors/huggingface/log_conf.yaml | 33 ----------------------------- 1 file changed, 33 deletions(-) delete mode 100644 detectors/huggingface/log_conf.yaml diff --git a/detectors/huggingface/log_conf.yaml b/detectors/huggingface/log_conf.yaml deleted file mode 100644 index 9761bed..0000000 --- a/detectors/huggingface/log_conf.yaml +++ /dev/null @@ -1,33 +0,0 @@ -version: 1 -disable_existing_loggers: False -formatters: - default: - format: '%(asctime)s - %(name)s - %(levelname)s - %(message)s' - access: - # "()": uvicorn.logging.AccessFormatter - format: '%(asctime)s - %(name)s - %(levelname)s - %(message)s' -handlers: - default: - formatter: default - class: logging.StreamHandler - stream: ext://sys.stderr - access: - formatter: access - class: logging.StreamHandler - stream: ext://sys.stdout -loggers: - uvicorn.error: - level: INFO - handlers: - - default - propagate: no - uvicorn.access: - level: INFO - handlers: - - access - propagate: no -root: - level: DEBUG - handlers: - - default - propagate: no \ No newline at end of file From e4bd32a189566fa98866eec03629b04517627c5b Mon Sep 17 00:00:00 2001 From: amberjblue Date: Thu, 31 Jul 2025 09:19:52 -0400 Subject: [PATCH 10/10] Update Dockerfile.hf --- detectors/Dockerfile.hf | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/detectors/Dockerfile.hf b/detectors/Dockerfile.hf index abc74c0..58e02fa 100644 --- a/detectors/Dockerfile.hf +++ b/detectors/Dockerfile.hf @@ -6,26 +6,19 @@ RUN microdnf update -y && \ microdnf clean all RUN pip install --no-cache-dir torch -# FROM icr.io/fm-stack/ubi9-minimal-py39-torch as builder FROM base as builder -COPY ./common/requirements.txt . -RUN pip install --no-cache-dir -r requirements.txt - -COPY ./huggingface/requirements.txt . -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir \ + guardrails-detector-common \ + guardrails-detector-huggingface FROM builder WORKDIR /app -ARG CACHEBUST=1 -RUN echo "$CACHEBUST" -COPY ./common /common -COPY ./huggingface/app.py /app -COPY ./huggingface/detector.py /app -COPY ./huggingface/scheme.py /app + +# COPY tests/dummy_models /app/models +# ENV MODEL_DIR=/app/models/bert/BertForSequenceClassification EXPOSE 8000 -CMD ["uvicorn", "app:app", "--workers", "4", "--host", "0.0.0.0", "--port", "8000", "--log-config", "/common/log_conf.yaml"] -# gunicorn main:app --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind 0.0.0.0:8000 \ No newline at end of file +CMD ["python", "-m", "uvicorn", "guardrails_detector_huggingface.app:app", "--workers", "4", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file