Merge branch 'evanroman/json' of https://github.com/Azure/azure-functions-python-library into evanroman/json

Author: Evan Roman

azure/functions/__init__.py

@@ -102,4 +102,4 @@
     'BlobSource'
 )
 
-__version__ = '1.23.0b1'
+__version__ = '1.24.0b1'

azure/functions/decorators/constants.py

@@ -43,3 +43,5 @@
 ASSISTANT_CREATE = "assistantCreate"
 ASSISTANT_POST = "assistantPost"
 SEMANTIC_SEARCH = "semanticSearch"
+MYSQL = "mysql"
+MYSQL_TRIGGER = "mysqlTrigger"

azure/functions/decorators/function_app.py

@@ -0,0 +1,61 @@
+#  Copyright (c) Microsoft Corporation. All rights reserved.
+#  Licensed under the MIT License.
+from typing import Optional
+
+from azure.functions.decorators.constants import MYSQL, MYSQL_TRIGGER
+from azure.functions.decorators.core import DataType, InputBinding, \
+    OutputBinding, Trigger
+
+
+class MySqlInput(InputBinding):
+    @staticmethod
+    def get_binding_name() -> str:
+        return MYSQL
+
+    def __init__(self,
+                 name: str,
+                 command_text: str,
+                 connection_string_setting: str,
+                 command_type: Optional[str] = 'Text',
+                 parameters: Optional[str] = None,
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
+        self.command_text = command_text
+        self.connection_string_setting = connection_string_setting
+        self.command_type = command_type
+        self.parameters = parameters
+        super().__init__(name=name, data_type=data_type)
+
+
+class MySqlOutput(OutputBinding):
+    @staticmethod
+    def get_binding_name() -> str:
+        return MYSQL
+
+    def __init__(self,
+                 name: str,
+                 command_text: str,
+                 connection_string_setting: str,
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
+        self.command_text = command_text
+        self.connection_string_setting = connection_string_setting
+        super().__init__(name=name, data_type=data_type)
+
+
+class MySqlTrigger(Trigger):
+    @staticmethod
+    def get_binding_name() -> str:
+        return MYSQL_TRIGGER
+
+    def __init__(self,
+                 name: str,
+                 table_name: str,
+                 connection_string_setting: str,
+                 leases_table_name: Optional[str] = None,
+                 data_type: Optional[DataType] = None,
+                 **kwargs):
+        self.table_name = table_name
+        self.connection_string_setting = connection_string_setting
+        self.leases_table_name = leases_table_name
+        super().__init__(name=name, data_type=data_type)

azure/functions/decorators/mysql.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Union
 
 from azure.functions.decorators.constants import (ASSISTANT_SKILL_TRIGGER,
                                                   TEXT_COMPLETION,
@@ -34,13 +34,11 @@ def __init__(self,
                  function_description: str,
                  function_name: Optional[str] = None,
                  parameter_description_json: Optional[str] = None,
-                 model: Optional[OpenAIModels] = OpenAIModels.DefaultChatModel,
                  data_type: Optional[DataType] = None,
                  **kwargs):
         self.function_description = function_description
         self.function_name = function_name
         self.parameter_description_json = parameter_description_json
-        self.model = model
         super().__init__(name=name, data_type=data_type)
 
 
@@ -53,17 +51,23 @@ def get_binding_name() -> str:
     def __init__(self,
                  name: str,
                  prompt: str,
-                 model: Optional[OpenAIModels] = OpenAIModels.DefaultChatModel,
+                 ai_connection_name: Optional[str] = "",
+                 chat_model: Optional
+                 [Union[str, OpenAIModels]]
+                 = OpenAIModels.DefaultChatModel,
                  temperature: Optional[str] = "0.5",
                  top_p: Optional[str] = None,
                  max_tokens: Optional[str] = "100",
+                 is_reasoning_model: Optional[bool] = False,
                  data_type: Optional[DataType] = None,
                  **kwargs):
         self.prompt = prompt
-        self.model = model
+        self.ai_connection_name = ai_connection_name
+        self.chat_model = chat_model
         self.temperature = temperature
         self.top_p = top_p
         self.max_tokens = max_tokens
+        self.is_reasoning_model = is_reasoning_model
         super().__init__(name=name, data_type=data_type)
 
 
@@ -98,15 +102,19 @@ def __init__(self,
                  name: str,
                  input: str,
                  input_type: InputType,
-                 model: Optional[str] = None,
+                 ai_connection_name: Optional[str] = "",
+                 embeddings_model: Optional
+                 [Union[str, OpenAIModels]]
+                 = OpenAIModels.DefaultEmbeddingsModel,
                  max_chunk_length: Optional[int] = 8 * 1024,
                  max_overlap: Optional[int] = 128,
                  data_type: Optional[DataType] = None,
                  **kwargs):
         self.name = name
         self.input = input
         self.input_type = input_type
-        self.model = model
+        self.ai_connection_name = ai_connection_name
+        self.embeddings_model = embeddings_model
         self.max_chunk_length = max_chunk_length
         self.max_overlap = max_overlap
         super().__init__(name=name, data_type=data_type)
@@ -137,25 +145,37 @@ def get_binding_name() -> str:
 
     def __init__(self,
                  name: str,
-                 connection_name: str,
+                 search_connection_name: str,
                  collection: str,
                  query: Optional[str] = None,
-                 embeddings_model: Optional[
-                     OpenAIModels] = OpenAIModels.DefaultEmbeddingsModel,
-                 chat_model: Optional[
-                     OpenAIModels] = OpenAIModels.DefaultChatModel,
+                 ai_connection_name: Optional[str] = "",
+                 embeddings_model: Optional
+                 [Union[str, OpenAIModels]]
+                 = OpenAIModels.DefaultEmbeddingsModel,
+                 chat_model: Optional
+                 [Union[str, OpenAIModels]]
+                 = OpenAIModels.DefaultChatModel,
                  system_prompt: Optional[str] = semantic_search_system_prompt,
                  max_knowledge_count: Optional[int] = 1,
+                 temperature: Optional[str] = "0.5",
+                 top_p: Optional[str] = None,
+                 max_tokens: Optional[str] = "100",
+                 is_reasoning_model: Optional[bool] = False,
                  data_type: Optional[DataType] = None,
                  **kwargs):
         self.name = name
-        self.connection_name = connection_name
+        self.search_connection_name = search_connection_name
         self.collection = collection
         self.query = query
+        self.ai_connection_name = ai_connection_name
         self.embeddings_model = embeddings_model
         self.chat_model = chat_model
         self.system_prompt = system_prompt
         self.max_knowledge_count = max_knowledge_count
+        self.temperature = temperature
+        self.top_p = top_p
+        self.max_tokens = max_tokens
+        self.is_reasoning_model = is_reasoning_model
         super().__init__(name=name, data_type=data_type)
 
 
@@ -168,17 +188,29 @@ def get_binding_name():
     def __init__(self, name: str,
                  id: str,
                  user_message: str,
-                 model: Optional[str] = None,
+                 ai_connection_name: Optional[str] = "",
+                 chat_model: Optional
+                 [Union[str, OpenAIModels]]
+                 = OpenAIModels.DefaultChatModel,
                  chat_storage_connection_setting: Optional[str] = "AzureWebJobsStorage",       # noqa: E501
                  collection_name: Optional[str] = "ChatState",
+                 temperature: Optional[str] = "0.5",
+                 top_p: Optional[str] = None,
+                 max_tokens: Optional[str] = "100",
+                 is_reasoning_model: Optional[bool] = False,
                  data_type: Optional[DataType] = None,
                  **kwargs):
         self.name = name
         self.id = id
         self.user_message = user_message
-        self.model = model
+        self.ai_connection_name = ai_connection_name
+        self.chat_model = chat_model
         self.chat_storage_connection_setting = chat_storage_connection_setting
         self.collection_name = collection_name
+        self.temperature = temperature
+        self.top_p = top_p
+        self.max_tokens = max_tokens
+        self.is_reasoning_model = is_reasoning_model
         super().__init__(name=name, data_type=data_type)
 
 
@@ -192,20 +224,23 @@ def __init__(self,
                  name: str,
                  input: str,
                  input_type: InputType,
-                 connection_name: str,
+                 store_connection_name: str,
                  collection: str,
-                 model: Optional[
-                     OpenAIModels] = OpenAIModels.DefaultEmbeddingsModel,
+                 ai_connection_name: Optional[str] = "",
+                 embeddings_model: Optional
+                 [Union[str, OpenAIModels]]
+                 = OpenAIModels.DefaultEmbeddingsModel,
                  max_chunk_length: Optional[int] = 8 * 1024,
                  max_overlap: Optional[int] = 128,
                  data_type: Optional[DataType] = None,
                  **kwargs):
         self.name = name
         self.input = input
         self.input_type = input_type
-        self.connection_name = connection_name
+        self.store_connection_name = store_connection_name
         self.collection = collection
-        self.model = model
+        self.ai_connection_name = ai_connection_name
+        self.embeddings_model = embeddings_model
         self.max_chunk_length = max_chunk_length
         self.max_overlap = max_overlap
         super().__init__(name=name, data_type=data_type)

azure/functions/decorators/openai.py

@@ -595,6 +595,45 @@ class TriggerApi(DecoratorApi, ABC):
 
         pass
 
+    def mysql_trigger(self,
+                    arg_name: str,
+                    table_name: str,
+                    connection_string_setting: str,
+                    leases_table_name: Optional[str] = None,
+                    data_type: Optional[DataType] = None,
+                    **kwargs) -> Callable[..., Any]:
+        """The mysql_trigger decorator adds :class:`MySqlTrigger`
+        to the :class:`FunctionBuilder` object
+        for building :class:`Function` object used in worker function
+        indexing model. This decorator will work only with extension bundle 4.x
+        and above.
+        This is equivalent to defining MySqlTrigger in the function.json which
+        enables function to be triggered when there are changes in the MySql
+        table.
+        All optional fields will be given default value by function host when
+        they are parsed by function host.
+
+        Ref: https://aka.ms/mysqlbindings
+
+        :param arg_name: The name of the variable that represents a
+        :class:`MySqlRowList` object in the function code
+        :param table_name: The name of the table monitored by the trigger
+        :param connection_string_setting: The name of an app setting that
+        contains the connection string for the database against which the
+        query or stored procedure is being executed
+        :param leases_table_name: The name of the table used to store
+        leases. If not specified, the leases table name will be
+        Leases_{FunctionId}_{TableId}.
+        :param data_type: Defines how Functions runtime should treat the
+        parameter value
+        :param kwargs: Keyword arguments for specifying additional binding
+        fields to include in the binding json
+
+        :return: Decorator function.
+        """
+
+        pass
+		
     def generic_trigger(self,
                         arg_name: str,
                         type: str,
@@ -1112,6 +1151,77 @@ class BindingApi(DecoratorApi, ABC):
 
         pass
 
+ def mysql_input(self,
+                  arg_name: str,
+                  command_text: str,
+                  connection_string_setting: str,
+                  command_type: Optional[str] = 'Text',
+                  parameters: Optional[str] = None,
+                  data_type: Optional[DataType] = None,
+                  **kwargs) -> Callable[..., Any]:
+        """The mysql_input decorator adds
+        :class:`MySqlInput` to the :class:`FunctionBuilder` object
+        for building :class:`Function` object used in worker function
+        indexing model. This decorator will work only with extension bundle 4.x
+        and above.
+        This is equivalent to defining MySqlInput in the function.json which
+        enables the function to read from a MySql database.
+        All optional fields will be given default value by function host when
+        they are parsed by function host.
+        Ref: https://aka.ms/mysqlbindings
+        :param arg_name: The name of the variable that represents a
+        :class:`MySqlRowList` input object in function code
+        :param command_text: The Transact-SQL query command or name of the
+        stored procedure executed by the binding
+        :param connection_string_setting: The name of an app setting that
+        contains the connection string for the database against which the
+        query or stored procedure is being executed
+        :param command_type: A CommandType value, which is Text for a query
+        and StoredProcedure for a stored procedure
+        :param parameters: Zero or more parameter values passed to the
+        command during execution as a single string. Must follow the format
+        @param1=param1,@param2=param2
+        :param data_type: Defines how Functions runtime should treat the
+        parameter value
+        :param kwargs: Keyword arguments for specifying additional binding
+        fields to include in the binding json
+        :return: Decorator function.
+        """
+
+        pass
+
+    def mysql_output(self,
+                   arg_name: str,
+                   command_text: str,
+                   connection_string_setting: str,
+                   data_type: Optional[DataType] = None,
+                   **kwargs) -> Callable[..., Any]:
+        """The mysql_output decorator adds
+        :class:`MySqlOutput` to the :class:`FunctionBuilder` object
+        for building :class:`Function` object used in worker function
+        indexing model. This decorator will work only with extension bundle 4.x
+        and above.
+        This is equivalent to defining MySqlOutput in the function.json which
+        enables the function to write to a MySql database.
+        All optional fields will be given default value by function host when
+        they are parsed by function host.
+        Ref: https://aka.ms/mysqlbindings
+        :param arg_name: The name of the variable that represents
+        MySql output object in function code
+        :param command_text: The Transact-SQL query command or name of the
+        stored procedure executed by the binding
+        :param connection_string_setting: The name of an app setting that
+        contains the connection string for the database against which the
+        query or stored procedure is being executed
+        :param data_type: Defines how Functions runtime should treat the
+        parameter value
+        :param kwargs: Keyword arguments for specifying additional binding
+        fields to include in the binding json
+        :return: Decorator function.
+        """
+
+        pass
+		
     def generic_input_binding(self,
                               arg_name: str,
                               type: str,

docs/ProgModelSpec.pyi

@@ -0,0 +1,21 @@
+pr: none
+
+resources:
+  repositories:
+    - repository: 1es
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1es
+  parameters:
+    pool:
+      name: 1es-pool-azfunc
+      image: 1es-windows-2022
+      os: windows
+
+    stages:
+      - stage: Release
+        jobs:
+          - template: /eng/templates/official/jobs/publish-release.yml@self