Merge pull request #18 from learntocloud/addresources

add resources

Author: madebygps

azure-project-generator/GenerateProject.cs

@@ -20,37 +20,37 @@ public GenerateProject(ILogger<GenerateProject> logger, ContentGenerationService
         }
 
         [Function("GenerateProject")]
-        public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Function, "get")] HttpRequestData req, string certificationCode, string skillName,
+        public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Function, "get")] HttpRequestData req, string certificationCode, string skillName, string topic,
              [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 certification exam " + certificationCode + " for the skill " + skillName;
 
             float[] projectPromptVector = _contentGenerationService.GenerateEmbeddingsAsync(projectPrompt).Result;
 
-            var queryDef = new QueryDefinition
-                (query: $"SELECT c.serviceName, c.skillName, c.topicName, VectorDistance(c.contextVector,@embedding) " +
-                $"AS SimilarityScore FROM c ORDER BY VectorDistance(c.contextVector,@embedding)"
-                ).WithParameter("@embedding", projectPromptVector);
+            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);
 
-            string projectServices = "";
+            List<string> projectServices = new List<string>();
 
             while (resultSetIterator.HasMoreResults)
             {
                 FeedResponse<CertificationService> feedResponse = resultSetIterator.ReadNextAsync().Result;
                 foreach (var item in feedResponse)
                 {
-                    projectServices += item.ServiceName + " ";
+                    projectServices.Add(item.ServiceName);
                 }
             }
 
-            string cloudProjectIdea = await _contentGenerationService.GenerateProjectIdeaAsync(projectServices, skillName);
+            string cloudProjectIdea = await _contentGenerationService.GenerateProjectIdeaAsync(projectServices, skillName, topic);
+
 
             response.Headers.Add("Content-Type", "application/json");
             await response.WriteStringAsync(cloudProjectIdea);

azure-project-generator/ProcessCertServiceFile.cs

@@ -35,19 +35,19 @@ public async Task<CertificationServiceOutput> Run(
             if (string.IsNullOrWhiteSpace(content))
             {
                 _logger.LogError("Blob content is empty or whitespace.");
-                return new CertificationServiceOutput { Document = null, ArchivedContent = null };
+                return new CertificationServiceOutput { Document = null};
             }
 
             if (!_jsonValidationService.ValidateJsonContent<CertificationService>(content))
             {
-                return new CertificationServiceOutput { Document = null, ArchivedContent = null };
+                return new CertificationServiceOutput { Document = null };
             }
 
             var mappedServiceData = JsonConvert.DeserializeObject<CertificationService>(content);
             if (mappedServiceData == null)
             {
                 _logger.LogError("Failed to deserialize content to MappedService.");
-                return new CertificationServiceOutput { Document = null, ArchivedContent = null };
+                return new CertificationServiceOutput { Document = null };
             }
 
             string contextSentence = _contentGenerationService.GenerateCertServiceContextSentence(mappedServiceData);
@@ -62,7 +62,7 @@ public async Task<CertificationServiceOutput> Run(
             return new CertificationServiceOutput
             {
                 Document = certServiceDocument,
-                ArchivedContent = content
+             
             };
         }
 

azure-project-generator/models/CertificationServiceOutput.cs

@@ -13,8 +13,5 @@ public class CertificationServiceOutput
         [CosmosDBOutput("%CosmosDb%", "%CertificationServiceOut%", Connection = "CosmosDBConnection")]
         public CertificationServiceDocument Document { get; set; }
 
-        [BlobOutput("certservicearchive/{name}", Connection = "AzureWebJobsStorage")]
-        public string ArchivedContent { get; set; }
-
     }
 }

azure-project-generator/models/CloudProjectIdea.cs

@@ -8,10 +8,15 @@ namespace azure_project_generator.models
 {
     public class CloudProjectIdea
     {
-       
-            public string Title { get; set; }
-            public string Description { get; set; }
-            public List<string> Steps { get; set; }
-        
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public List<string> Steps { get; set; }
+        public List<string> Resources { get; set; }
+
+        // Constructor to initialize Resources
+        public CloudProjectIdea()
+        {
+            Resources = new List<string>();
+        }
     }
 }

azure-project-generator/services/ContentGenerationService.cs

@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Logging;
 using OpenAI.Embeddings;
 using OpenAI.Chat;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
 
 namespace azure_project_generator.services
 {
@@ -45,34 +45,33 @@ public async Task<float[]> GenerateEmbeddingsAsync(string content)
             }
         }
 
-        public async Task<string> GenerateProjectIdeaAsync(string services, string skill)
+        public async Task<string> GenerateProjectIdeaAsync(List<string> services, string skill, string topic)
         {
-            string userPrompt = $@"You are an expert cloud architect. 
-Please generate a detailed project idea for a beginner-friendly weekend cloud solution 
-based on the following Azure certification skill: {skill}.
-The project should utilize the ONLY following services: {services}.
-The project should be small in scale, achievable over a weekend, and have a fun, creative name. Suitable for beginners. Cheap to run.
-The response must be formatted as valid JSON and include only the following fields:
-{{
-    ""projectName"": ""A fun and creative project name"",
-    ""description"": ""A brief, engaging description of the project, highlighting its purpose and main features."",
-    ""learningGoals"": [""Goal 1"", ""Goal 2"", ""Goal 3""],
-    ""steps"": [
-        ""Step 1: Description of the first step"",
-        ""Step 2: Description of the second step"",
-        ""Step 3: Description of the third step"",
-        ""Step 4: Description of the fourth step"",
-        ""Step 5: Description of the fifth step""
-    ]
-}}
-Ensure that the project idea is practical, aligned with beginner-level skills, and leverages best practices in Azure architecture.  Small in scope";
+            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.";
 
             try
             {
                 _logger.LogInformation("Generating project idea...");
                 ChatCompletion completion = await _completionsClient.CompleteChatAsync(new ChatMessage[]
                 {
-                new SystemChatMessage("You are a technical assistant specialized in generating beginner-friendly cloud project ideas. Provide the response in JSON format only, without any additional text."),
+                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)
                 });
 
@@ -90,21 +89,22 @@ public async Task<string> GenerateProjectIdeaAsync(string services, string skill
                     .Replace("json\n", string.Empty)
                     .Trim();
 
-                JObject jsonObject = JObject.Parse(cleanedJsonContent);
+                // deserialize to CloudProjectIdea object
 
-                // Validate that all required fields are present
-                string[] requiredFields = { "projectName", "description", "learningGoals", "steps"};
-                foreach (var field in requiredFields)
+                CloudProjectIdea cloudProjectIdea = JsonConvert.DeserializeObject<CloudProjectIdea>(cleanedJsonContent);
+                foreach (var service in services)
                 {
-                    if (!jsonObject.ContainsKey(field))
-                    {
-                        _logger.LogWarning($"Generated JSON is missing required field: {field}");
-                        throw new System.Text.Json.JsonException($"Generated project idea is missing required field: {field}");
+                    // 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");
                 }
 
-                return jsonObject.ToString();
+                string jsonString = JsonConvert.SerializeObject(cloudProjectIdea);
+
+                return jsonString;
             }
             catch (System.Text.Json.JsonException ex)
             {
@@ -123,4 +123,4 @@ public async Task<string> GenerateProjectIdeaAsync(string services, string skill
             }
         }
     }
-}
+}