Integrate Azure Blob and update JSON handling

- Updated `ProcessCertDataFile` to include `BlobServiceClient` for Azure Blob Storage operations.
- Modified `ProcessCertDataFile` to generate and upload JSON files to "certservice" container.
- Switched `ProcessCertServiceFile` to use `CertificationService` for JSON validation and deserialization.
- Updated `CreateCertServiceDocument` method in `ProcessCertServiceFile` to use `CertificationService`.
- Registered `BlobServiceClient` as a singleton in `Program.cs`.
- Updated `azure-project-generator.csproj` to include `JsonSchema.Net` and `JsonSchema.Net.Generation` packages, and removed `Newtonsoft.Json.Schema`.
- Renamed `MappedService` to `CertificationService`.
- Renamed `SkillMeasured` to `CertificationSkillMeasured`.
- Updated `ContentGenerationService` to use `CertificationService` in `GenerateCertServiceContextSentence`.
- Updated `JsonValidationService` to use `JsonSchema.Net` for JSON schema validation.

Author: madebygps

azure-project-generator/ProcessCertPromptFile.cs renamed to azure-project-generator/ProcessCertDataFile.cs

@@ -4,28 +4,32 @@
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using OpenAI.Embeddings;
+using Azure.Storage.Blobs;
+using System.Text;
 
 namespace azure_project_generator
 {
-    public class ProcessCertPromptFile
+    public class ProcessCertDataFile
     {
         private readonly ILogger<ProcessCertServiceFile> _logger;
         private readonly EmbeddingClient _embeddingClient;
         private readonly JsonValidationService _jsonValidationService;
         private readonly ContentGenerationService _contentGenerationService;
+        private readonly BlobServiceClient _blobServiceClient;
 
-        public ProcessCertPromptFile(ILogger<ProcessCertServiceFile> logger,
+        public ProcessCertDataFile(ILogger<ProcessCertServiceFile> logger,
             EmbeddingClient embeddingClient,
             JsonValidationService jsonValidationService,
-            ContentGenerationService contentGenerationService)
-        {                                       
+            ContentGenerationService contentGenerationService, BlobServiceClient blobServiceClient)
+        {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _embeddingClient = embeddingClient ?? throw new ArgumentNullException(nameof(embeddingClient));
             _jsonValidationService = jsonValidationService ?? throw new ArgumentNullException(nameof(jsonValidationService));
             _contentGenerationService = contentGenerationService ?? throw new ArgumentNullException(nameof(contentGenerationService));
+            _blobServiceClient = blobServiceClient ?? throw new ArgumentNullException(nameof(blobServiceClient));
         }
 
-        [Function(nameof(ProcessCertPromptFile))]
+        [Function(nameof(ProcessCertDataFile))]
         public async Task<CertificationProjectPromptOutput> Run([BlobTrigger("certdata/{name}", Connection = "AzureWebJobsStorage")] string content, string name)
         {
 
@@ -47,6 +51,34 @@ public async Task<CertificationProjectPromptOutput> Run([BlobTrigger("certdata/{
                 return new CertificationProjectPromptOutput { Document = null, ArchivedContent = null };
             }
 
+            // create a json file for each service in the certification
+
+            foreach (var skill in certification.SkillsMeasured)
+            {
+                foreach (var topic in skill.Topics)
+                {
+                    foreach (var service in topic.Services)
+                    {
+                        var serviceData = new CertificationService
+                        {
+                            CertificationCode = certification.CertificationCode,
+                            CertificationName = certification.CertificationName,
+                            SkillName = skill.Name,
+                            TopicName = topic.TopicName,
+                            ServiceName = service
+                        };
+                        BlobContainerClient blobContainerClient = _blobServiceClient.GetBlobContainerClient("certservice");
+                        var serviceJson = JsonConvert.SerializeObject(serviceData);
+                        var serviceBlobName = $"{certification.CertificationCode}-{serviceData.ServiceName}.json";
+                        
+                        BlobClient blobClient = blobContainerClient.GetBlobClient(serviceBlobName);
+                        await blobClient.UploadAsync(new MemoryStream(Encoding.UTF8.GetBytes(serviceJson)), true);
+                    }
+                }
+            }
+               
+
+
             string contextSentence = _contentGenerationService.GenerateCertDataContextSentence(certification);
             float[] contentVector = await _contentGenerationService.GenerateEmbeddingsAsync(contextSentence);
 

azure-project-generator/ProcessCertServiceFile.cs

@@ -38,12 +38,12 @@ public async Task<CertificationServiceOutput> Run(
                 return new CertificationServiceOutput { Document = null, ArchivedContent = null };
             }
 
-            if (!_jsonValidationService.ValidateJsonContent<MappedService>(content))
+            if (!_jsonValidationService.ValidateJsonContent<CertificationService>(content))
             {
                 return new CertificationServiceOutput { Document = null, ArchivedContent = null };
             }
 
-            var mappedServiceData = JsonConvert.DeserializeObject<MappedService>(content);
+            var mappedServiceData = JsonConvert.DeserializeObject<CertificationService>(content);
             if (mappedServiceData == null)
             {
                 _logger.LogError("Failed to deserialize content to MappedService.");
@@ -68,7 +68,7 @@ public async Task<CertificationServiceOutput> Run(
 
         // Other methods remain unchanged
 
-        private CertificationServiceDocument CreateCertServiceDocument(MappedService data, string contextSentence, float[] contentVector) =>
+        private CertificationServiceDocument CreateCertServiceDocument(CertificationService data, string contextSentence, float[] contentVector) =>
            new CertificationServiceDocument
            {
                Id = Guid.NewGuid().ToString(),

azure-project-generator/Program.cs

@@ -1,5 +1,6 @@
 using Azure;
 using Azure.AI.OpenAI;
+using Azure.Storage.Blobs;
 using azure_project_generator.services;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Extensions.DependencyInjection;
@@ -19,12 +20,16 @@
         string keyFromEnvironment = config["AZURE_OPENAI_API_KEY"];
         string endpointFromEnvironment = config["AZURE_OPENAI_API_ENDPOINT"];
         string embeddingsDeployment = config["EMBEDDINGS_DEPLOYMENT"];
+        string azureWebJobsStorage = config["AzureWebJobsStorage"];
 
         if (string.IsNullOrEmpty(keyFromEnvironment) || string.IsNullOrEmpty(endpointFromEnvironment) || string.IsNullOrEmpty(embeddingsDeployment))
         {
             throw new InvalidOperationException("Required Azure OpenAI configuration is missing.");
         }
 
+        // Register BlobServiceClient as a singleton
+        services.AddSingleton(new BlobServiceClient(azureWebJobsStorage));
+
         AzureOpenAIClient azureClient = new(
             new Uri(endpointFromEnvironment),
             new AzureKeyCredential(keyFromEnvironment));

azure-project-generator/azure-project-generator.csproj

@@ -16,6 +16,8 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.19.1" />
     <PackageReference Include="Azure.Storage.Queues" Version="12.19.1" />
+    <PackageReference Include="JsonSchema.Net" Version="7.2.2" />
+    <PackageReference Include="JsonSchema.Net.Generation" Version="4.5.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.CosmosDB" Version="4.10.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
@@ -26,7 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.3.0" />
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

azure-project-generator/models/MappedService.cs renamed to azure-project-generator/models/CertificationService.cs

@@ -2,7 +2,7 @@
 
 namespace azure_project_generator.models
 {
-    public class MappedService
+    public class CertificationService
     {
         [JsonProperty("certificationCode")]
         public string CertificationCode { get; set; }

azure-project-generator/models/SkillMeasured.cs renamed to azure-project-generator/models/CertificationSkillMeasured.cs

@@ -2,7 +2,7 @@
 
 namespace azure_project_generator.models
 {
-    public class SkillMeasured
+    public class CertificationSkillMeasured
     {
         [Required]
         public string Name { get; set; }

azure-project-generator/services/ContentGenerationService.cs

@@ -16,7 +16,7 @@ public ContentGenerationService(ILogger<ContentGenerationService> logger, Embedd
             _embeddingClient = embeddingClient ?? throw new ArgumentNullException(nameof(embeddingClient));
         }
 
-        public string GenerateCertServiceContextSentence(MappedService data) =>
+        public string GenerateCertServiceContextSentence(CertificationService data) =>
             $"The {data.CertificationCode} {data.CertificationName} certification includes the skill of {data.SkillName}. Within this skill, there is a focus on the topic of {data.TopicName}, particularly through the use of the service {data.ServiceName}.";
 
         public string GenerateCertDataContextSentence(Certification certificationDocument)

azure-project-generator/services/JsonValidationService.cs

@@ -1,8 +1,11 @@
+using Json.Schema;
+using Json.Schema.Generation;
+using Json.Schema.Serialization;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
-using Newtonsoft.Json.Schema.Generation;
 using System.Text.Json;
+using System.Text.Json.Nodes;
+
 
 namespace azure_project_generator.services
 {
@@ -20,25 +23,25 @@ public bool ValidateJsonContent<T>(string content)
         {
             try
             {
-                var generator = new JSchemaGenerator();
-                JSchema schema = generator.Generate(typeof(T));
+                JsonSchemaBuilder jsonSchemaBuilder = new JsonSchemaBuilder();
+                var schema1 = jsonSchemaBuilder.FromType<T>().Build();
+
+                var result = schema1.Evaluate(JsonNode.Parse(content));
 
-                JToken jsonContent = JToken.Parse(content);
-                bool isValid = jsonContent.IsValid(schema, out IList<string> messages);
 
-                if (!isValid)
+                if (!result.IsValid)
                 {
-                    foreach (var message in messages)
+                    foreach (var error in result.Errors)
                     {
-                        _logger.LogError($"Schema validation error: {message}");
+                        _logger.LogError($"Schema validation error: {error.Key} + \": \" + {error.Value}");
                     }
                 }
                 else
                 {
                     _logger.LogInformation("JSON content is valid against the schema.");
                 }
 
-                return isValid;
+                return result.IsValid;
             }
             catch (JsonException ex)
             {