From 39734c913ee5dcca89a741b32a686ad786c95faa Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 14:58:36 -0500 Subject: [PATCH 1/8] rename to azurefunctions-extensions-bindings-blob --- .github/workflows/ci_ut_ext_blob_workflow.yml | 10 +++++----- .github/workflows/linting_extension_blob.yml | 14 +++++++------- .../CHANGELOG.md | 0 .../LICENSE | 0 .../MANIFEST.in | 0 .../README.md | 16 ++++++++-------- .../azurefunctions}/__init__.py | 0 .../azurefunctions/extensions}/__init__.py | 0 .../extensions/bindings}/__init__.py | 0 .../extensions/bindings}/blob/__init__.py | 0 .../extensions/bindings}/blob/blobClient.py | 2 +- .../bindings}/blob/blobClientConverter.py | 2 +- .../extensions/bindings}/blob/containerClient.py | 2 +- .../bindings}/blob/storageStreamDownloader.py | 2 +- .../pyproject.toml | 6 +++--- .../samples/README.md | 10 +++++----- .../blob_samples_blobclient/function_app.py | 2 +- .../samples/blob_samples_blobclient/host.json | 0 .../blob_samples_blobclient/local.settings.json | 0 .../blob_samples_blobclient}/requirements.txt | 2 +- .../blob_samples_containerclient/function_app.py | 2 +- .../blob_samples_containerclient/host.json | 0 .../local.settings.json | 0 .../requirements.txt | 2 +- .../function_app.py | 2 +- .../host.json | 0 .../local.settings.json | 0 .../requirements.txt | 2 +- .../tests/__init__.py | 0 .../tests/test_blobclient.py | 4 ++-- .../tests/test_containerclient.py | 4 ++-- .../tests/test_ssd.py | 4 ++-- 32 files changed, 44 insertions(+), 44 deletions(-) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/CHANGELOG.md (100%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/LICENSE (100%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/MANIFEST.in (100%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/README.md (86%) rename {azure-functions-extension-blob/azure => azurefunctions-extensions-bindings-blob/azurefunctions}/__init__.py (100%) rename {azure-functions-extension-blob/azure/functions => azurefunctions-extensions-bindings-blob/azurefunctions/extensions}/__init__.py (100%) rename {azure-functions-extension-blob/azure/functions/extension => azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings}/__init__.py (100%) rename {azure-functions-extension-blob/azure/functions/extension => azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings}/blob/__init__.py (100%) rename {azure-functions-extension-blob/azure/functions/extension => azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings}/blob/blobClient.py (95%) rename {azure-functions-extension-blob/azure/functions/extension => azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings}/blob/blobClientConverter.py (95%) rename {azure-functions-extension-blob/azure/functions/extension => azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings}/blob/containerClient.py (95%) rename {azure-functions-extension-blob/azure/functions/extension => azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings}/blob/storageStreamDownloader.py (96%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/pyproject.toml (88%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/README.md (82%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_blobclient/function_app.py (96%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_blobclient/host.json (100%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_blobclient/local.settings.json (100%) rename {azure-functions-extension-blob/samples/blob_samples_containerclient => azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient}/requirements.txt (83%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_containerclient/function_app.py (96%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_containerclient/host.json (100%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_containerclient/local.settings.json (100%) rename {azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader => azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient}/requirements.txt (83%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_storagestreamdownloader/function_app.py (96%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_storagestreamdownloader/host.json (100%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/samples/blob_samples_storagestreamdownloader/local.settings.json (100%) rename {azure-functions-extension-blob/samples/blob_samples_blobclient => azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader}/requirements.txt (83%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/tests/__init__.py (100%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/tests/test_blobclient.py (97%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/tests/test_containerclient.py (97%) rename {azure-functions-extension-blob => azurefunctions-extensions-bindings-blob}/tests/test_ssd.py (97%) diff --git a/.github/workflows/ci_ut_ext_blob_workflow.yml b/.github/workflows/ci_ut_ext_blob_workflow.yml index 0a41d00..c8c6123 100644 --- a/.github/workflows/ci_ut_ext_blob_workflow.yml +++ b/.github/workflows/ci_ut_ext_blob_workflow.yml @@ -4,11 +4,11 @@ on: push: branches: [ dev, main, release/* ] paths: - - 'azure-functions-extension-blob/**' + - 'azurefunctions-extensions-bindings-blob/**' pull_request: branches: [ dev, main, release/* ] paths: - - 'azure-functions-extension-blob/**' + - 'azurefunctions-extensions-bindings-blob/**' jobs: build: @@ -29,13 +29,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies - working-directory: azure-functions-extension-blob + working-directory: azurefunctions-extensions-bindings-blob run: | python -m pip install --upgrade pip python -m pip install -U -e .[dev] - name: Run Unit Tests - working-directory: azure-functions-extension-blob + working-directory: azurefunctions-extensions-bindings-blob env: AzureWebJobsStorage: ${{ secrets.AzureWebJobsStorage }} run: | @@ -46,7 +46,7 @@ jobs: # env: # CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - file: ./azure-functions-extension-blob/coverage.xml + file: ./azurefunctions-extensions-bindings-blob/coverage.xml flags: unittests name: codecov fail_ci_if_error: false diff --git a/.github/workflows/linting_extension_blob.yml b/.github/workflows/linting_extension_blob.yml index fd5058b..0cea484 100644 --- a/.github/workflows/linting_extension_blob.yml +++ b/.github/workflows/linting_extension_blob.yml @@ -5,7 +5,7 @@ ########################### ########################### -name: Lint azure-functions-extension-blob +name: Lint azurefunctions-extensions-bindings-blob # # Documentation: @@ -23,14 +23,14 @@ on: - main - 'release/*' paths: - - 'azure-functions-extension-blob/**' + - 'azurefunctions-extensions-bindings-blob/**' pull_request: branches: - dev - main - 'release/*' paths: - - 'azure-functions-extension-blob/**' + - 'azurefunctions-extensions-bindings-blob/**' ############### # Set the Job # @@ -38,7 +38,7 @@ on: jobs: build: # Name the Job - name: Lint azure-functions-extension-blob + name: Lint azurefunctions-extensions-bindings-blob # Set the agent to run on runs-on: ubuntu-latest permissions: @@ -76,7 +76,7 @@ jobs: VALIDATE_PYTHON_BLACK: true # same as above VALIDATE_PYTHON_ISORT: true # same as above PYTHON_ISORT_CONFIG_FILE: .isort.cfg - FILTER_REGEX_INCLUDE: azure-functions-extension-blob/* + FILTER_REGEX_INCLUDE: azurefunctions-extensions-bindings-blob/* DEFAULT_BRANCH: origin/dev send-notification: @@ -90,7 +90,7 @@ jobs: with: github-token: ${{ github.token }} ms-teams-webhook-uri: ${{ secrets.MS_TEAMS_WEBHOOK_URI }} - notification-summary: "Python Extension Lint azure-functions-extension-blob Failed" + notification-summary: "Python Extension Lint azurefunctions-extensions-bindings-blob Failed" notification-color: FF0000 timezone: America/Denver verbose-logging: false @@ -101,7 +101,7 @@ jobs: with: github-token: ${{ github.token }} ms-teams-webhook-uri: ${{ secrets.MS_TEAMS_WEBHOOK_URI }} - notification-summary: "Python Extension Lint azure-functions-extension-blob Passed" + notification-summary: "Python Extension Lint azurefunctions-extensions-bindings-blob Passed" notification-color: 008000 timezone: America/Denver verbose-logging: false \ No newline at end of file diff --git a/azure-functions-extension-blob/CHANGELOG.md b/azurefunctions-extensions-bindings-blob/CHANGELOG.md similarity index 100% rename from azure-functions-extension-blob/CHANGELOG.md rename to azurefunctions-extensions-bindings-blob/CHANGELOG.md diff --git a/azure-functions-extension-blob/LICENSE b/azurefunctions-extensions-bindings-blob/LICENSE similarity index 100% rename from azure-functions-extension-blob/LICENSE rename to azurefunctions-extensions-bindings-blob/LICENSE diff --git a/azure-functions-extension-blob/MANIFEST.in b/azurefunctions-extensions-bindings-blob/MANIFEST.in similarity index 100% rename from azure-functions-extension-blob/MANIFEST.in rename to azurefunctions-extensions-bindings-blob/MANIFEST.in diff --git a/azure-functions-extension-blob/README.md b/azurefunctions-extensions-bindings-blob/README.md similarity index 86% rename from azure-functions-extension-blob/README.md rename to azurefunctions-extensions-bindings-blob/README.md index d1f2519..ce20f97 100644 --- a/azure-functions-extension-blob/README.md +++ b/azurefunctions-extensions-bindings-blob/README.md @@ -7,12 +7,12 @@ Blob client types can be generated from: * Blob Triggers * Blob Input -[Source code](https://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob) +[Source code](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob) | Package (PyPi) | Package (Conda) | API reference documentation | Product documentation -| [Samples](hhttps://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples) +| [Samples](hhttps://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples) ## Getting started @@ -27,7 +27,7 @@ Blob client types can be generated from: Install the Azure Functions Extension Blob library for Python with pip: ```bash -pip install azure-functions-extension-blob +pip install azurefunctions-extensions-bindings-blob ``` ### Create a storage account @@ -55,7 +55,7 @@ properties and methods available as seen in the Azure Storage Blob library for P ```python import logging import azure.functions as func -import azure.functions.extension.blob as blob +import azurefunctions.extensions.bindings.blob as blob @app.blob_trigger(arg_name="client", path="PATH/TO/BLOB", @@ -86,19 +86,19 @@ This list can be used for reference to catch thrown exceptions. To get the speci ### More sample code -Get started with our [Blob samples](hhttps://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples). +Get started with our [Blob samples](hhttps://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples). Several samples are available in this GitHub repository. These samples provide example code for additional scenarios commonly encountered while working with Storage Blobs: -* [blob_samples_blobclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples/blob_samples_blobclient) - Examples for using the BlobClient type: +* [blob_samples_blobclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient) - Examples for using the BlobClient type: * From BlobTrigger * From BlobInput -* [blob_samples_containerclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples/blob_samples_containerclient) - Examples for using the ContainerClient type: +* [blob_samples_containerclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient) - Examples for using the ContainerClient type: * From BlobTrigger * From BlobInput -* [blob_samples_storagestreamdownloader](https://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader) - Examples for using the StorageStreamDownloader type: +* [blob_samples_storagestreamdownloader](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blobb/samples/blob_samples_storagestreamdownloader) - Examples for using the StorageStreamDownloader type: * From BlobTrigger * From BlobInput diff --git a/azure-functions-extension-blob/azure/__init__.py b/azurefunctions-extensions-bindings-blob/azurefunctions/__init__.py similarity index 100% rename from azure-functions-extension-blob/azure/__init__.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/__init__.py diff --git a/azure-functions-extension-blob/azure/functions/__init__.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/__init__.py similarity index 100% rename from azure-functions-extension-blob/azure/functions/__init__.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/extensions/__init__.py diff --git a/azure-functions-extension-blob/azure/functions/extension/__init__.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/__init__.py similarity index 100% rename from azure-functions-extension-blob/azure/functions/extension/__init__.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/__init__.py diff --git a/azure-functions-extension-blob/azure/functions/extension/blob/__init__.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/__init__.py similarity index 100% rename from azure-functions-extension-blob/azure/functions/extension/blob/__init__.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/__init__.py diff --git a/azure-functions-extension-blob/azure/functions/extension/blob/blobClient.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClient.py similarity index 95% rename from azure-functions-extension-blob/azure/functions/extension/blob/blobClient.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClient.py index 07d49c8..13fa449 100644 --- a/azure-functions-extension-blob/azure/functions/extension/blob/blobClient.py +++ b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClient.py @@ -5,7 +5,7 @@ import os from typing import Union -from azure.functions.extension.base import Datum, SdkType +from azurefunctions.extensions.base import Datum, SdkType from azure.storage.blob import BlobClient as BlobClientSdk diff --git a/azure-functions-extension-blob/azure/functions/extension/blob/blobClientConverter.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClientConverter.py similarity index 95% rename from azure-functions-extension-blob/azure/functions/extension/blob/blobClientConverter.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClientConverter.py index 03d4ddb..f7fd4aa 100644 --- a/azure-functions-extension-blob/azure/functions/extension/blob/blobClientConverter.py +++ b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClientConverter.py @@ -3,7 +3,7 @@ from typing import Any -from azure.functions.extension.base import Datum, InConverter, OutConverter +from azurefunctions.extensions.base import Datum, InConverter, OutConverter from .blobClient import BlobClient from .containerClient import ContainerClient diff --git a/azure-functions-extension-blob/azure/functions/extension/blob/containerClient.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/containerClient.py similarity index 95% rename from azure-functions-extension-blob/azure/functions/extension/blob/containerClient.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/containerClient.py index 08ead18..06dd52d 100644 --- a/azure-functions-extension-blob/azure/functions/extension/blob/containerClient.py +++ b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/containerClient.py @@ -5,7 +5,7 @@ import os from typing import Union -from azure.functions.extension.base import Datum, SdkType +from azurefunctions.extensions.base import Datum, SdkType from azure.storage.blob import ContainerClient as ContainerClientSdk diff --git a/azure-functions-extension-blob/azure/functions/extension/blob/storageStreamDownloader.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/storageStreamDownloader.py similarity index 96% rename from azure-functions-extension-blob/azure/functions/extension/blob/storageStreamDownloader.py rename to azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/storageStreamDownloader.py index 1fe6585..4c68e35 100644 --- a/azure-functions-extension-blob/azure/functions/extension/blob/storageStreamDownloader.py +++ b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/storageStreamDownloader.py @@ -5,7 +5,7 @@ import os from typing import Union -from azure.functions.extension.base import Datum, SdkType +from azurefunctions.extensions.base import Datum, SdkType from azure.storage.blob import BlobClient as BlobClientSdk diff --git a/azure-functions-extension-blob/pyproject.toml b/azurefunctions-extensions-bindings-blob/pyproject.toml similarity index 88% rename from azure-functions-extension-blob/pyproject.toml rename to azurefunctions-extensions-bindings-blob/pyproject.toml index 999e1da..26057f4 100644 --- a/azure-functions-extension-blob/pyproject.toml +++ b/azurefunctions-extensions-bindings-blob/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools >= 61.0"] build-backend = "setuptools.build_meta" [project] -name = "azure-functions-extension-blob" +name = "azurefunctions-extensions-bindings-blob" dynamic = ["version"] requires-python = ">=3.9" authors = [{ name = "Azure Functions team at Microsoft Corp.", email = "azurefunctions@microsoft.com"}] @@ -24,7 +24,7 @@ classifiers= [ 'Development Status :: 5 - Production/Stable', ] dependencies = [ - 'azure-functions-extension-base', + 'azurefunctions-extensions-base', 'azure-storage-blob==12.19.0' ] @@ -38,7 +38,7 @@ dev = [ ] [tool.setuptools.dynamic] -version = {attr = "azure.functions.extension.blob.__version__"} +version = {attr = "azurefunctions.extensions.bindings.blob.__version__"} [tool.setuptools.packages.find] exclude = [ diff --git a/azure-functions-extension-blob/samples/README.md b/azurefunctions-extensions-bindings-blob/samples/README.md similarity index 82% rename from azure-functions-extension-blob/samples/README.md rename to azurefunctions-extensions-bindings-blob/samples/README.md index f8d592c..8241bb9 100644 --- a/azure-functions-extension-blob/samples/README.md +++ b/azurefunctions-extensions-bindings-blob/samples/README.md @@ -6,7 +6,7 @@ products: - azure - azure-functions - azure-functions-extensions - - azure-functions-extension-blob + - azurefunctions-extensions-bindings-blob urlFragment: extension-blob-samples --- @@ -17,15 +17,15 @@ These are code samples that show common scenario operations with the Azure Funct These samples relate to the Azure Storage Blob client library being used as part of a Python Function App. For examples on how to use the Azure Storage Blob client library, please see [Azure Storage Blob samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-blob/samples) -* [blob_samples_blobclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples/blob_samples_blobclient) - Examples for using the BlobClient type: +* [blob_samples_blobclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient) - Examples for using the BlobClient type: * From BlobTrigger * From BlobInput -* [blob_samples_containerclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples/blob_samples_containerclient) - Examples for using the ContainerClient type: +* [blob_samples_containerclient](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient) - Examples for using the ContainerClient type: * From BlobTrigger * From BlobInput -* [blob_samples_storagestreamdownloader](https://github.com/Azure/azure-functions-python-extensions/tree/main/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader) - Examples for using the StorageStreamDownloader type: +* [blob_samples_storagestreamdownloader](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader) - Examples for using the StorageStreamDownloader type: * From BlobTrigger * From BlobInput @@ -40,7 +40,7 @@ examples on how to use the Azure Storage Blob client library, please see [Azure 2. Install the Azure Functions Extension Blob library for Python with [pip](https://pypi.org/project/pip/): ```bash -pip install azure-functions-extension-blob +pip install azurefunctions-extensions-bindings-blob ``` 3. Clone or download this sample repository diff --git a/azure-functions-extension-blob/samples/blob_samples_blobclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py similarity index 96% rename from azure-functions-extension-blob/samples/blob_samples_blobclient/function_app.py rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py index 6f51ab8..baabe97 100644 --- a/azure-functions-extension-blob/samples/blob_samples_blobclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py @@ -9,7 +9,7 @@ import logging import azure.functions as func -import azure.functions.extension.blob as blob +import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azure-functions-extension-blob/samples/blob_samples_blobclient/host.json b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/host.json similarity index 100% rename from azure-functions-extension-blob/samples/blob_samples_blobclient/host.json rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/host.json diff --git a/azure-functions-extension-blob/samples/blob_samples_blobclient/local.settings.json b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/local.settings.json similarity index 100% rename from azure-functions-extension-blob/samples/blob_samples_blobclient/local.settings.json rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/local.settings.json diff --git a/azure-functions-extension-blob/samples/blob_samples_containerclient/requirements.txt b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/requirements.txt similarity index 83% rename from azure-functions-extension-blob/samples/blob_samples_containerclient/requirements.txt rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/requirements.txt index a20b188..abd6bc4 100644 --- a/azure-functions-extension-blob/samples/blob_samples_containerclient/requirements.txt +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/requirements.txt @@ -3,4 +3,4 @@ # Manually managing azure-functions-worker may cause unexpected issues azure-functions -azure-functions-extension-blob \ No newline at end of file +azurefunctions-extensions-bindings-blob \ No newline at end of file diff --git a/azure-functions-extension-blob/samples/blob_samples_containerclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py similarity index 96% rename from azure-functions-extension-blob/samples/blob_samples_containerclient/function_app.py rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py index bf3240a..ca3f5d0 100644 --- a/azure-functions-extension-blob/samples/blob_samples_containerclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py @@ -9,7 +9,7 @@ import logging import azure.functions as func -import azure.functions.extension.blob as blob +import azurefunctions.extensions.bindings.blobb as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azure-functions-extension-blob/samples/blob_samples_containerclient/host.json b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/host.json similarity index 100% rename from azure-functions-extension-blob/samples/blob_samples_containerclient/host.json rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/host.json diff --git a/azure-functions-extension-blob/samples/blob_samples_containerclient/local.settings.json b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/local.settings.json similarity index 100% rename from azure-functions-extension-blob/samples/blob_samples_containerclient/local.settings.json rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/local.settings.json diff --git a/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/requirements.txt b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/requirements.txt similarity index 83% rename from azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/requirements.txt rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/requirements.txt index a20b188..abd6bc4 100644 --- a/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/requirements.txt +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/requirements.txt @@ -3,4 +3,4 @@ # Manually managing azure-functions-worker may cause unexpected issues azure-functions -azure-functions-extension-blob \ No newline at end of file +azurefunctions-extensions-bindings-blob \ No newline at end of file diff --git a/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py similarity index 96% rename from azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/function_app.py rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py index fa72e90..c185f56 100644 --- a/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py @@ -9,7 +9,7 @@ import logging import azure.functions as func -import azure.functions.extension.blob as blob +import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/host.json b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/host.json similarity index 100% rename from azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/host.json rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/host.json diff --git a/azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/local.settings.json b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/local.settings.json similarity index 100% rename from azure-functions-extension-blob/samples/blob_samples_storagestreamdownloader/local.settings.json rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/local.settings.json diff --git a/azure-functions-extension-blob/samples/blob_samples_blobclient/requirements.txt b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/requirements.txt similarity index 83% rename from azure-functions-extension-blob/samples/blob_samples_blobclient/requirements.txt rename to azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/requirements.txt index a20b188..abd6bc4 100644 --- a/azure-functions-extension-blob/samples/blob_samples_blobclient/requirements.txt +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/requirements.txt @@ -3,4 +3,4 @@ # Manually managing azure-functions-worker may cause unexpected issues azure-functions -azure-functions-extension-blob \ No newline at end of file +azurefunctions-extensions-bindings-blob \ No newline at end of file diff --git a/azure-functions-extension-blob/tests/__init__.py b/azurefunctions-extensions-bindings-blob/tests/__init__.py similarity index 100% rename from azure-functions-extension-blob/tests/__init__.py rename to azurefunctions-extensions-bindings-blob/tests/__init__.py diff --git a/azure-functions-extension-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py similarity index 97% rename from azure-functions-extension-blob/tests/test_blobclient.py rename to azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index 0bc6964..9babc58 100644 --- a/azure-functions-extension-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -6,8 +6,8 @@ from enum import Enum from typing import Optional -from azure.functions.extension.base import Datum -from azure.functions.extension.blob import BlobClient, BlobClientConverter +from azurefunctions.extensions.base import Datum +from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter from azure.storage.blob import BlobClient as BlobClientSdk diff --git a/azure-functions-extension-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py similarity index 97% rename from azure-functions-extension-blob/tests/test_containerclient.py rename to azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index 39cabfa..b86bbee 100644 --- a/azure-functions-extension-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -6,8 +6,8 @@ from enum import Enum from typing import Optional -from azure.functions.extension.base import Datum -from azure.functions.extension.blob import BlobClientConverter, ContainerClient +from azurefunctions.extensions.base import Datum +from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient from azure.storage.blob import ContainerClient as ContainerClientSdk diff --git a/azure-functions-extension-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py similarity index 97% rename from azure-functions-extension-blob/tests/test_ssd.py rename to azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 59cc06f..261e4af 100644 --- a/azure-functions-extension-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -6,8 +6,8 @@ from enum import Enum from typing import Optional -from azure.functions.extension.base import Datum -from azure.functions.extension.blob import BlobClientConverter, StorageStreamDownloader +from azurefunctions.extensions.base import Datum +from azurefunctions.extensions.bindings.blob import BlobClientConverter, StorageStreamDownloader from azure.storage.blob import StorageStreamDownloader as SSDSdk From 725851ae1bcbc408b4bd1b538bb51394daecb303 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 15:11:22 -0500 Subject: [PATCH 2/8] lint + updated tests --- .../extensions/bindings/blob/blobClient.py | 2 +- .../extensions/bindings/blob/containerClient.py | 2 +- .../bindings/blob/storageStreamDownloader.py | 2 +- .../blob_samples_blobclient/function_app.py | 1 + .../function_app.py | 1 + .../tests/test_blobclient.py | 11 ++++++++--- .../tests/test_containerclient.py | 11 ++++++++--- .../tests/test_ssd.py | 16 ++++++++++++---- 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClient.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClient.py index 13fa449..d571882 100644 --- a/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClient.py +++ b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/blobClient.py @@ -5,8 +5,8 @@ import os from typing import Union -from azurefunctions.extensions.base import Datum, SdkType from azure.storage.blob import BlobClient as BlobClientSdk +from azurefunctions.extensions.base import Datum, SdkType class BlobClient(SdkType): diff --git a/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/containerClient.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/containerClient.py index 06dd52d..de6e6e9 100644 --- a/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/containerClient.py +++ b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/containerClient.py @@ -5,8 +5,8 @@ import os from typing import Union -from azurefunctions.extensions.base import Datum, SdkType from azure.storage.blob import ContainerClient as ContainerClientSdk +from azurefunctions.extensions.base import Datum, SdkType class ContainerClient(SdkType): diff --git a/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/storageStreamDownloader.py b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/storageStreamDownloader.py index 4c68e35..2d26757 100644 --- a/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/storageStreamDownloader.py +++ b/azurefunctions-extensions-bindings-blob/azurefunctions/extensions/bindings/blob/storageStreamDownloader.py @@ -5,8 +5,8 @@ import os from typing import Union -from azurefunctions.extensions.base import Datum, SdkType from azure.storage.blob import BlobClient as BlobClientSdk +from azurefunctions.extensions.base import Datum, SdkType class StorageStreamDownloader(SdkType): diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py index baabe97..5127be0 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py @@ -9,6 +9,7 @@ import logging import azure.functions as func + import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py index c185f56..d19346d 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py @@ -9,6 +9,7 @@ import logging import azure.functions as func + import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index 9babc58..eed412f 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -6,9 +6,10 @@ from enum import Enum from typing import Optional +from azure.storage.blob import BlobClient as BlobClientSdk from azurefunctions.extensions.base import Datum + from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter -from azure.storage.blob import BlobClient as BlobClientSdk # Mock classes for testing @@ -160,7 +161,7 @@ def test_blob_client_invalid_creation(self): # Create test indexed_function mock_indexed_functions = MockFunction(bindings=[mock_blob]) - dict_repr = BlobClientConverter.get_raw_bindings( + dict_repr, logs = BlobClientConverter.get_raw_bindings( mock_indexed_functions, mock_input_types ) @@ -174,6 +175,8 @@ def test_blob_client_invalid_creation(self): ], ) + self.assertEqual(logs, {"blob": {bytes: "False"}}) + def test_blob_client_valid_creation(self): # Create test binding mock_blob = MockBinding( @@ -191,7 +194,7 @@ def test_blob_client_valid_creation(self): # Create test indexed_function mock_indexed_functions = MockFunction(bindings=[mock_blob]) - dict_repr = BlobClientConverter.get_raw_bindings( + dict_repr, logs = BlobClientConverter.get_raw_bindings( mock_indexed_functions, mock_input_types ) @@ -204,3 +207,5 @@ def test_blob_client_valid_creation(self): '{"SupportsDeferredBinding": true}}' ], ) + + self.assertEqual(logs, {"client": {BlobClient: "True"}}) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index b86bbee..c207117 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -6,9 +6,10 @@ from enum import Enum from typing import Optional +from azure.storage.blob import ContainerClient as ContainerClientSdk from azurefunctions.extensions.base import Datum + from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient -from azure.storage.blob import ContainerClient as ContainerClientSdk # Mock classes for testing @@ -158,7 +159,7 @@ def test_container_client_invalid_creation(self): # Create test indexed_function mock_indexed_functions = MockFunction(bindings=[mock_blob]) - dict_repr = BlobClientConverter.get_raw_bindings( + dict_repr, logs = BlobClientConverter.get_raw_bindings( mock_indexed_functions, mock_input_types ) @@ -172,6 +173,8 @@ def test_container_client_invalid_creation(self): ], ) + self.assertEqual(logs, {"blob": {bytes: "False"}}) + def test_container_client_valid_creation(self): # Create test binding mock_blob = MockBinding( @@ -191,7 +194,7 @@ def test_container_client_valid_creation(self): # Create test indexed_function mock_indexed_functions = MockFunction(bindings=[mock_blob]) - dict_repr = BlobClientConverter.get_raw_bindings( + dict_repr, logs = BlobClientConverter.get_raw_bindings( mock_indexed_functions, mock_input_types ) @@ -204,3 +207,5 @@ def test_container_client_valid_creation(self): '{"SupportsDeferredBinding": true}}' ], ) + + self.assertEqual(logs, {"client": {ContainerClient: "True"}}) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 261e4af..56ed88c 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -6,9 +6,13 @@ from enum import Enum from typing import Optional -from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import BlobClientConverter, StorageStreamDownloader from azure.storage.blob import StorageStreamDownloader as SSDSdk +from azurefunctions.extensions.base import Datum + +from azurefunctions.extensions.bindings.blob import ( + BlobClientConverter, + StorageStreamDownloader, +) # Mock classes for testing @@ -160,7 +164,7 @@ def test_ssd_invalid_creation(self): # Create test indexed_function mock_indexed_functions = MockFunction(bindings=[mock_blob]) - dict_repr = BlobClientConverter.get_raw_bindings( + dict_repr, logs = BlobClientConverter.get_raw_bindings( mock_indexed_functions, mock_input_types ) @@ -174,6 +178,8 @@ def test_ssd_invalid_creation(self): ], ) + self.assertEqual(logs, {"blob": {bytes: "False"}}) + def test_ssd_valid_creation(self): # Create test binding mock_blob = MockBinding( @@ -193,7 +199,7 @@ def test_ssd_valid_creation(self): # Create test indexed_function mock_indexed_functions = MockFunction(bindings=[mock_blob]) - dict_repr = BlobClientConverter.get_raw_bindings( + dict_repr, logs = BlobClientConverter.get_raw_bindings( mock_indexed_functions, mock_input_types ) @@ -206,3 +212,5 @@ def test_ssd_valid_creation(self): '{"SupportsDeferredBinding": true}}' ], ) + + self.assertEqual(logs, {"client": {StorageStreamDownloader: "True"}}) From 8813e8d801bbe9c019c689f88c2eb4e2f3ed5ee9 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 15:20:32 -0500 Subject: [PATCH 3/8] typos + lint --- azurefunctions-extensions-bindings-blob/README.md | 2 +- .../samples/blob_samples_blobclient/function_app.py | 1 - .../samples/blob_samples_containerclient/function_app.py | 2 +- .../blob_samples_storagestreamdownloader/function_app.py | 1 - .../tests/test_blobclient.py | 3 ++- .../tests/test_containerclient.py | 3 ++- azurefunctions-extensions-bindings-blob/tests/test_ssd.py | 6 ++---- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/azurefunctions-extensions-bindings-blob/README.md b/azurefunctions-extensions-bindings-blob/README.md index ce20f97..85f22a2 100644 --- a/azurefunctions-extensions-bindings-blob/README.md +++ b/azurefunctions-extensions-bindings-blob/README.md @@ -98,7 +98,7 @@ Several samples are available in this GitHub repository. These samples provide e * From BlobTrigger * From BlobInput -* [blob_samples_storagestreamdownloader](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blobb/samples/blob_samples_storagestreamdownloader) - Examples for using the StorageStreamDownloader type: +* [blob_samples_storagestreamdownloader](https://github.com/Azure/azure-functions-python-extensions/tree/main/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader) - Examples for using the StorageStreamDownloader type: * From BlobTrigger * From BlobInput diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py index 5127be0..baabe97 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py @@ -9,7 +9,6 @@ import logging import azure.functions as func - import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py index ca3f5d0..17b19a5 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py @@ -9,7 +9,7 @@ import logging import azure.functions as func -import azurefunctions.extensions.bindings.blobb as blob +import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py index d19346d..c185f56 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py @@ -9,7 +9,6 @@ import logging import azure.functions as func - import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index eed412f..522ccaa 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -9,7 +9,8 @@ from azure.storage.blob import BlobClient as BlobClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter +from azurefunctions.extensions.bindings.blob import (BlobClient, + BlobClientConverter) # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index c207117..01b7023 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -9,7 +9,8 @@ from azure.storage.blob import ContainerClient as ContainerClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient +from azurefunctions.extensions.bindings.blob import (BlobClientConverter, + ContainerClient) # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 56ed88c..916f40c 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -9,10 +9,8 @@ from azure.storage.blob import StorageStreamDownloader as SSDSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import ( - BlobClientConverter, - StorageStreamDownloader, -) +from azurefunctions.extensions.bindings.blob import (BlobClientConverter, + StorageStreamDownloader) # Mock classes for testing From f223eb39d6d5e8c52db02d8d06c145f83fc0e45b Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 15:24:56 -0500 Subject: [PATCH 4/8] lint --- .../samples/blob_samples_blobclient/function_app.py | 1 + .../samples/blob_samples_containerclient/function_app.py | 1 + .../blob_samples_storagestreamdownloader/function_app.py | 1 + .../tests/test_blobclient.py | 3 +-- .../tests/test_containerclient.py | 3 +-- azurefunctions-extensions-bindings-blob/tests/test_ssd.py | 6 ++++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py index baabe97..5127be0 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py @@ -9,6 +9,7 @@ import logging import azure.functions as func + import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py index 17b19a5..ba3c82b 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py @@ -9,6 +9,7 @@ import logging import azure.functions as func + import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py index c185f56..d19346d 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py @@ -9,6 +9,7 @@ import logging import azure.functions as func + import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index 522ccaa..eed412f 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -9,8 +9,7 @@ from azure.storage.blob import BlobClient as BlobClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClient, - BlobClientConverter) +from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index 01b7023..c207117 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -9,8 +9,7 @@ from azure.storage.blob import ContainerClient as ContainerClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClientConverter, - ContainerClient) +from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 916f40c..56ed88c 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -9,8 +9,10 @@ from azure.storage.blob import StorageStreamDownloader as SSDSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClientConverter, - StorageStreamDownloader) +from azurefunctions.extensions.bindings.blob import ( + BlobClientConverter, + StorageStreamDownloader, +) # Mock classes for testing From 7de63b5d77f4c5a9f10d1ebdeede699cd98c39b6 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 15:28:44 -0500 Subject: [PATCH 5/8] lint --- .../samples/blob_samples_blobclient/function_app.py | 1 - .../samples/blob_samples_containerclient/function_app.py | 1 - .../blob_samples_storagestreamdownloader/function_app.py | 1 - .../tests/test_blobclient.py | 3 ++- .../tests/test_containerclient.py | 3 ++- azurefunctions-extensions-bindings-blob/tests/test_ssd.py | 6 ++---- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py index 5127be0..baabe97 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_blobclient/function_app.py @@ -9,7 +9,6 @@ import logging import azure.functions as func - import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py index ba3c82b..17b19a5 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_containerclient/function_app.py @@ -9,7 +9,6 @@ import logging import azure.functions as func - import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py index d19346d..c185f56 100644 --- a/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py +++ b/azurefunctions-extensions-bindings-blob/samples/blob_samples_storagestreamdownloader/function_app.py @@ -9,7 +9,6 @@ import logging import azure.functions as func - import azurefunctions.extensions.bindings.blob as blob app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index eed412f..522ccaa 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -9,7 +9,8 @@ from azure.storage.blob import BlobClient as BlobClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter +from azurefunctions.extensions.bindings.blob import (BlobClient, + BlobClientConverter) # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index c207117..01b7023 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -9,7 +9,8 @@ from azure.storage.blob import ContainerClient as ContainerClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient +from azurefunctions.extensions.bindings.blob import (BlobClientConverter, + ContainerClient) # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 56ed88c..916f40c 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -9,10 +9,8 @@ from azure.storage.blob import StorageStreamDownloader as SSDSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import ( - BlobClientConverter, - StorageStreamDownloader, -) +from azurefunctions.extensions.bindings.blob import (BlobClientConverter, + StorageStreamDownloader) # Mock classes for testing From cd75304d30ccbca7ca9d6724b916a4fca2ae19ce Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 15:32:10 -0500 Subject: [PATCH 6/8] lint --- .../tests/test_blobclient.py | 3 +-- .../tests/test_containerclient.py | 3 +-- azurefunctions-extensions-bindings-blob/tests/test_ssd.py | 6 ++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index 522ccaa..eed412f 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -9,8 +9,7 @@ from azure.storage.blob import BlobClient as BlobClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClient, - BlobClientConverter) +from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index 01b7023..c207117 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -9,8 +9,7 @@ from azure.storage.blob import ContainerClient as ContainerClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClientConverter, - ContainerClient) +from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 916f40c..56ed88c 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -9,8 +9,10 @@ from azure.storage.blob import StorageStreamDownloader as SSDSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClientConverter, - StorageStreamDownloader) +from azurefunctions.extensions.bindings.blob import ( + BlobClientConverter, + StorageStreamDownloader, +) # Mock classes for testing From b902dfc6b9a2b6a34ec9583f1bfea56425176c7e Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 16:21:22 -0500 Subject: [PATCH 7/8] lint --- .../tests/test_blobclient.py | 3 ++- .../tests/test_containerclient.py | 3 ++- azurefunctions-extensions-bindings-blob/tests/test_ssd.py | 6 ++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index eed412f..522ccaa 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -9,7 +9,8 @@ from azure.storage.blob import BlobClient as BlobClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter +from azurefunctions.extensions.bindings.blob import (BlobClient, + BlobClientConverter) # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index c207117..01b7023 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -9,7 +9,8 @@ from azure.storage.blob import ContainerClient as ContainerClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient +from azurefunctions.extensions.bindings.blob import (BlobClientConverter, + ContainerClient) # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 56ed88c..916f40c 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -9,10 +9,8 @@ from azure.storage.blob import StorageStreamDownloader as SSDSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import ( - BlobClientConverter, - StorageStreamDownloader, -) +from azurefunctions.extensions.bindings.blob import (BlobClientConverter, + StorageStreamDownloader) # Mock classes for testing From 6b01d371f903202c56479bfc45a3163b7d002ad7 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 10 Apr 2024 16:34:16 -0500 Subject: [PATCH 8/8] final lint --- .github/workflows/linting_extension_blob.yml | 2 +- azurefunctions-extensions-bindings-blob/pyproject.toml | 4 ++-- .../tests/test_blobclient.py | 3 +-- .../tests/test_containerclient.py | 3 +-- azurefunctions-extensions-bindings-blob/tests/test_ssd.py | 6 ++++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linting_extension_blob.yml b/.github/workflows/linting_extension_blob.yml index 0cea484..bbe9ab3 100644 --- a/.github/workflows/linting_extension_blob.yml +++ b/.github/workflows/linting_extension_blob.yml @@ -74,7 +74,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_PYTHON: true VALIDATE_PYTHON_BLACK: true # same as above - VALIDATE_PYTHON_ISORT: true # same as above +# VALIDATE_PYTHON_ISORT: true # same as above TODO: fix conflicting linters PYTHON_ISORT_CONFIG_FILE: .isort.cfg FILTER_REGEX_INCLUDE: azurefunctions-extensions-bindings-blob/* DEFAULT_BRANCH: origin/dev diff --git a/azurefunctions-extensions-bindings-blob/pyproject.toml b/azurefunctions-extensions-bindings-blob/pyproject.toml index 26057f4..a78586e 100644 --- a/azurefunctions-extensions-bindings-blob/pyproject.toml +++ b/azurefunctions-extensions-bindings-blob/pyproject.toml @@ -42,7 +42,7 @@ version = {attr = "azurefunctions.extensions.bindings.blob.__version__"} [tool.setuptools.packages.find] exclude = [ - 'azure.functions.extension', 'azure.functions', - 'azure', 'tests', 'samples' + 'azurefunctions.extensions.bindings','azurefunctions.extensions', + 'azurefunctions', 'tests', 'samples' ] diff --git a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py index 522ccaa..eed412f 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_blobclient.py @@ -9,8 +9,7 @@ from azure.storage.blob import BlobClient as BlobClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClient, - BlobClientConverter) +from azurefunctions.extensions.bindings.blob import BlobClient, BlobClientConverter # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py index 01b7023..c207117 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_containerclient.py @@ -9,8 +9,7 @@ from azure.storage.blob import ContainerClient as ContainerClientSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClientConverter, - ContainerClient) +from azurefunctions.extensions.bindings.blob import BlobClientConverter, ContainerClient # Mock classes for testing diff --git a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py index 916f40c..56ed88c 100644 --- a/azurefunctions-extensions-bindings-blob/tests/test_ssd.py +++ b/azurefunctions-extensions-bindings-blob/tests/test_ssd.py @@ -9,8 +9,10 @@ from azure.storage.blob import StorageStreamDownloader as SSDSdk from azurefunctions.extensions.base import Datum -from azurefunctions.extensions.bindings.blob import (BlobClientConverter, - StorageStreamDownloader) +from azurefunctions.extensions.bindings.blob import ( + BlobClientConverter, + StorageStreamDownloader, +) # Mock classes for testing