Merge pull request #23 from learntocloud/definitionendpoint

Refactor project generation and enhance ContentService

Author: madebygps

azure-project-generator/GenerateProject.cs renamed to azure-project-generator/GenerateProjectFromCertification.cs

@@ -8,18 +8,18 @@
 
 namespace azure_project_generator
 {
-    public class GenerateProject
+    public class GenerateProjectFromCertification
     {
-        private readonly ILogger<GenerateProject> _logger;
+        private readonly ILogger<GenerateProjectFromCertification> _logger;
         private readonly ContentGenerationService _contentGenerationService;
 
-        public GenerateProject(ILogger<GenerateProject> logger, ContentGenerationService contentGenerationService)
+        public GenerateProjectFromCertification(ILogger<GenerateProjectFromCertification> logger, ContentGenerationService contentGenerationService)
         {
             _logger = logger;
             _contentGenerationService = contentGenerationService;
         }
 
-        [Function("GenerateProject")]
+        [Function("GenerateProjectFromCertification")]
         public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Function, "get")] HttpRequestData req, string certificationCode, string skillName, string topic,
              [CosmosDBInput(Connection = "CosmosDBConnection")] CosmosClient client)
         {
@@ -49,7 +49,7 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Function
                 }
             }
 
-            string cloudProjectIdea = await _contentGenerationService.GenerateProjectIdeaAsync(projectServices, skillName, topic);
+            string cloudProjectIdea = await _contentGenerationService.GenerateProjectIdeaFromCertAsync(projectServices, skillName, topic);
 
 
             response.Headers.Add("Content-Type", "application/json");

azure-project-generator/GenerateProjectFromConcept.cs

@@ -0,0 +1,63 @@
+using azure_project_generator.models;
+using azure_project_generator.services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.Cosmos;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.Azure.Functions.Worker.Http;
+using Microsoft.Extensions.Logging;
+using System.Net;
+
+namespace azure_project_generator
+{
+    public class GenerateProjectFromConcept
+    {
+        private readonly ILogger<GenerateProjectFromConcept> _logger;
+        private ContentGenerationService _contentGenerationService;
+
+        public GenerateProjectFromConcept(ILogger<GenerateProjectFromConcept> logger, ContentGenerationService contentGenerationService)
+        {
+            _logger = logger;
+            _contentGenerationService = contentGenerationService;
+        }
+
+        [Function("GenerateProjectFromConcept")]
+        public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Admin, "get", "post")] HttpRequestData req, string concept,
+             [CosmosDBInput(Connection = "CosmosDBConnection")]
+        CosmosClient client)
+        {
+            var response = req.CreateResponse(HttpStatusCode.OK);
+            _logger.LogInformation("C# HTTP trigger function processed a request.");
+
+            string projectPrompt = $"I need a project idea for the cloud engineering concept exam {concept}";
+
+            float[] projectPromptVector = _contentGenerationService.GenerateEmbeddingsAsync(projectPrompt).Result;
+
+            var queryDef = new QueryDefinition(
+    query: $"SELECT TOP 5 c.serviceName, c.skillName, c.topicName, VectorDistance(c.contextVector, @embedding) " +
+           $"AS SimilarityScore FROM c ORDER BY VectorDistance(c.contextVector, @embedding)"
+    ).WithParameter("@embedding", projectPromptVector);
+
+            using FeedIterator<CertificationService> resultSetIterator =
+                 client.GetContainer("AzureCertDB", "certvectors").GetItemQueryIterator<CertificationService>(queryDef);
+
+            List<string> projectServices = new List<string>();
+
+            while (resultSetIterator.HasMoreResults)
+            {
+                FeedResponse<CertificationService> feedResponse = resultSetIterator.ReadNextAsync().Result;
+                foreach (var item in feedResponse)
+                {
+                    projectServices.Add(item.ServiceName);
+                }
+            }
+            string cloudProjectIdea = await _contentGenerationService.GenerateProjectIdeaFromConceptAsync(projectServices, concept);
+
+
+            response.Headers.Add("Content-Type", "application/json");
+            await response.WriteStringAsync(cloudProjectIdea);
+
+            return response;
+        }
+    }
+}

azure-project-generator/services/ContentGenerationService.cs

@@ -1,9 +1,11 @@
+
 using Azure;
 using azure_project_generator.models;
 using Microsoft.Extensions.Logging;
 using OpenAI.Embeddings;
 using OpenAI.Chat;
 using Newtonsoft.Json;
+using System.Text.RegularExpressions;
 
 namespace azure_project_generator.services
 {
@@ -12,6 +14,19 @@ public class ContentGenerationService
         private readonly ILogger<ContentGenerationService> _logger;
         private readonly EmbeddingClient _embeddingClient;
         private readonly ChatClient _completionsClient;
+
+        private const string JSON_FORMAT = @"{{
+            ""title"": ""A concise, descriptive project name"",
+            ""description"": ""A factual description of the project, highlighting its technical purpose and main features."",
+            ""steps"": [
+                ""Step 1: Description of the first technical step"",
+                ""Step 2: Description of the second technical step"",
+                ""Step 3: Description of the third technical step"",
+                ""Step 4: Description of the fourth technical step"",
+                ""Step 5: Description of the fifth technical step""
+            ]
+        }}";
+
         public ContentGenerationService(ILogger<ContentGenerationService> logger, EmbeddingClient embeddingClient, ChatClient completionsClient)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -24,6 +39,7 @@ public string GenerateCertServiceContextSentence(CertificationService data) =>
 
         public string GenerateCertDataContextSentence(Certification data) =>
             $"The {data.CertificationCode} {data.CertificationName} certification includes the following skills: {string.Join(", ", data.SkillsMeasured.Select(s => s.Name))}.";
+
         public async Task<float[]> GenerateEmbeddingsAsync(string content)
         {
             try
@@ -45,34 +61,41 @@ public async Task<float[]> GenerateEmbeddingsAsync(string content)
             }
         }
 
-        public async Task<string> GenerateProjectIdeaAsync(List<string> services, string skill, string topic)
+        public async Task<string> GenerateProjectIdeaFromCertAsync(List<string> services, string skill, string topic)
         {
             string userPrompt = $@"You are a cloud architect specializing in Azure architecture.
-                    Please generate a detailed project idea for a small, practical cloud solution based on the following Azure certification skill: {skill} and topic: {topic}.
-                    The project should utilize ONLY the following services: {services}.
-                    The project should focus on key technical steps without any subjective descriptions or recommendations.
-                    The response must be formatted as valid JSON and include only the following fields:
-                                {{
-                                    ""title"": ""A concise, descriptive project name"",
-                        ""description"": ""A factual description of the project, highlighting its technical purpose and main features."",
-                        ""steps"": [
-                            ""Step 1: Description of the first technical step"",
-                            ""Step 2: Description of the second technical step"",
-                            ""Step 3: Description of the third technical step"",
-                            ""Step 4: Description of the fourth technical step"",
-                            ""Step 5: Description of the fifth technical step""
-                                    ]
-                                }}
-                             Ensure that the project idea is focused purely on technical details, aligned with best practices in Azure architecture, and small in scope.";
+                Please generate a detailed project idea for a small, practical cloud solution based on the following Azure certification skill: {skill} and topic: {topic}.
+                The project should utilize ONLY the following services: {string.Join(", ", services)}.
+                The project should focus on key technical steps without any subjective descriptions or recommendations.
+                The response must be formatted as valid JSON and include only the following fields:
+                {JSON_FORMAT}
+                Ensure that the project idea is focused purely on technical details, aligned with best practices in Azure architecture, and small in scope.";
+
+            return await GenerateProjectIdeaAsync(userPrompt, services, topic);
+        }
 
+        public async Task<string> GenerateProjectIdeaFromConceptAsync(List<string> services, string topic)
+        {
+            string userPrompt = $@"You are a cloud architect.
+                Please generate a detailed project idea for a small, practical cloud solution based on the following cloud engineering concept certification: {topic}.
+                The project should utilize ONLY the following services: {string.Join(", ", services)}.
+                The project should focus on key technical steps without any subjective descriptions or recommendations.
+                The response must be formatted as valid JSON and include only the following fields:
+                {JSON_FORMAT}
+                Ensure that the project idea is focused purely on technical details, aligned with best practices in cloud architecture, and small in scope.";
+
+            return await GenerateProjectIdeaAsync(userPrompt, services, topic);
+        }
+
+        private async Task<string> GenerateProjectIdeaAsync(string userPrompt, List<string> services, string topic)
+        {
             try
             {
                 _logger.LogInformation("Generating project idea...");
                 ChatCompletion completion = await _completionsClient.CompleteChatAsync(new ChatMessage[]
                 {
-                new SystemChatMessage("You are a cloud engineer and mentor specialized in generating " +
-                "beginner-friendly cloud project ideas. Provide the response in JSON format only, without any additional text."),
-                new UserChatMessage(userPrompt)
+                    new SystemChatMessage("You are a cloud engineer and mentor specialized in generating beginner-friendly cloud project ideas. Provide the response in JSON format only, without any additional text."),
+                    new UserChatMessage(userPrompt)
                 });
 
                 string projectIdeaContent = completion.Content[0].Text;
@@ -83,37 +106,19 @@ The project should focus on key technical steps without any subjective descripti
                     throw new Exception("Failed to generate project idea.");
                 }
 
-                string cleanedJsonContent = projectIdeaContent
-                    .Replace("```json", string.Empty)
-                    .Replace("```", string.Empty)
-                    .Replace("json\n", string.Empty)
-                    .Trim();
-
-                // deserialize to CloudProjectIdea object
+                string cleanedJsonContent = CleanJsonContent(projectIdeaContent);
 
                 CloudProjectIdea? cloudProjectIdea = JsonConvert.DeserializeObject<CloudProjectIdea>(cleanedJsonContent);
                 if (cloudProjectIdea == null)
                 {
                     _logger.LogError("Deserialization returned null for project idea.");
                     throw new Exception("Failed to deserialize project idea.");
                 }
-                // Ensure Steps is initialized if it's null
-                cloudProjectIdea.Steps ??= new List<string>();
-
-                foreach (var service in services)
-                {
-                    // Properly encode the skill, topic, and service
-                    string encodedTopic = System.Net.WebUtility.UrlEncode(topic);
-                    string encodedService = System.Net.WebUtility.UrlEncode(service);
 
-                    // Construct the URL using the encoded values
-                    cloudProjectIdea.Resources.Add($"https://learn.microsoft.com/search/?terms={encodedTopic}%20{encodedService}&category=Training");
-                }
-
-                
-                string jsonString = JsonConvert.SerializeObject(cloudProjectIdea);
+                cloudProjectIdea.Steps ??= new List<string>();
+                cloudProjectIdea.Resources = GenerateResources(services, topic);
 
-                return jsonString;
+                return JsonConvert.SerializeObject(cloudProjectIdea);
             }
             catch (System.Text.Json.JsonException ex)
             {
@@ -131,5 +136,17 @@ The project should focus on key technical steps without any subjective descripti
                 throw;
             }
         }
+
+        private string CleanJsonContent(string content)
+        {
+            return Regex.Replace(content, @"^```json\s*|\s*```$", "", RegexOptions.Multiline).Trim();
+        }
+
+        private List<string> GenerateResources(List<string> services, string topic)
+        {
+            return services.Select(service =>
+                $"https://learn.microsoft.com/search/?terms={System.Net.WebUtility.UrlEncode(topic)}%20{System.Net.WebUtility.UrlEncode(service)}&category=Training"
+            ).ToList();
+        }
     }
 }