Merge pull request 'tail the .env so we can see it in pipelin' (#8) from pipeline_creation into master

Reviewed-on: #8

.gitea/workflows/deploy.yml

@@ -21,33 +21,30 @@ jobs:
                   source .venv/bin/activate
                   pip install --upgrade pip
                   pip install -r requirements.txt
-                  git config --global user.name "Blog Creator"
-                  git config --global user.email "ridgway.infrastructure@gmail.com"
-                  git config --global push.autoSetupRemote true
 
             - name: Create .env
               shell: bash
               run: |
                   echo "TRILIUM_HOST=${{ vars.TRILIUM_HOST }}" > .env
-                  echo "TRILIUM_PORT='${{ vars.TRILIUM_PORT }}'" >> .env
-                  echo "TRILIUM_PROTOCOL='${{ vars.TRILIUM_PROTOCOL }}'" >> .env
-                  echo "TRILIUM_PASS='${{ secrets.TRILIUM_PASS }}'" >> .env
-                  echo "TRILIUM_TOKEN='${{ secrets.TRILIUM_TOKEN }}'" >> .env
-                  echo "OLLAMA_PROTOCOL='${{ vars.OLLAMA_PROTOCOL }}'" >> .env
-                  echo "OLLAMA_HOST='${{ vars.OLLAMA_HOST }}'" >> .env
-                  echo "OLLAMA_PORT='${{ vars.OLLAMA_PORT }}'" >> .env
-                  echo "EMBEDDING_MODEL='${{ vars.EMBEDDING_MODEL }}'" >> .env
-                  echo "EDITOR_MODEL='${{ vars.EDITOR_MODEL }}'" >> .env
-                  export PURE='["${{ vars.CONTENT_CREATOR_MODELS_1 }}", "${{ vars.CONTENT_CREATOR_MODELS_2 }}", "${{ vars.CONTENT_CREATOR_MODELS_3 }}", "${{ vars.CONTENT_CREATOR_MODELS_4 }}"]'
-                  echo "CONTENT_CREATOR_MODELS='$PURE'" >> .env
-                  echo "GIT_PROTOCOL='${{ vars.GIT_PROTOCOL }}'" >> .env
-                  echo "GIT_REMOTE='${{ vars.GIT_REMOTE }}'" >> .env
-                  echo "GIT_USER='${{ vars.GIT_USER }}'" >> .env
+                  echo "TRILIUM_PORT=${{ vars.TRILIUM_PORT }}" >> .env
+                  echo "TRILIUM_PROTOCOL=${{ vars.TRILIUM_PROTOCOL }}" >> .env
+                  echo "TRILIUM_PASS=${{ secrets.TRILIUM_PASS }}" >> .env
+                  echo "TRILIUM_TOKEN=${{ secrets.TRILIUM_TOKEN }}" >> .env
+                  echo "OLLAMA_PROTOCOL=${{ vars.OLLAMA_PROTOCOL }}" >> .env
+                  echo "OLLAMA_HOST=${{ vars.OLLAMA_HOST }}" >> .env
+                  echo "OLLAMA_PORT=${{ vars.OLLAMA_PORT }}" >> .env
+                  echo "EMBEDDING_MODEL=${{ vars.EMBEDDING_MODEL }}" >> .env
+                  echo "EDITOR_MODEL=${{ vars.EDITOR_MODEL }}" >> .env
+                  echo "CONTENT_CREATOR_MODELS='${{ vars.CONTENT_CREATOR_MODELS }}'" >> .env
+                  echo "GIT_PROTOCOL=${{ vars.GIT_PROTOCOL }}" >> .env
+                  echo "GIT_REMOTE=${{ vars.GIT_REMOTE }}" >> .env
+                  echo "GIT_USER=${{ vars.GIT_USER }}" >> .env
                   echo "GIT_PASS='${{ secrets.GIT_PASS }}'" >> .env
                   echo "N8N_SECRET='${{ secrets.N8N_SECRET }}'" >> .env
                   echo "N8N_WEBHOOK_URL='${{ vars.N8N_WEBHOOK_URL }}'" >> .env
-                  echo "CHROMA_HOST='${{ vars.CHROMA_HOST }}'" >> .env
-                  echo "CHROMA_PORT='${{ vars.CHROMA_PORT }}'" >> .env
+                  echo "CHROMA_HOST=${{ vars.CHROMA_HOST }}" >> .env
+                  echo "CHROMA_PORT=${{ vars.CHROMA_PORT }}" >> .env
+                  tail .env -n 100
 
             - name: Create Blogs
               shell: bash

src/ai_generators/ollama_md_generator.py

@@ -11,8 +11,6 @@ class OllamaGenerator:
         self.inner_title = inner_title
         self.content = content
         self.response = None
-        print("In Class")
-        print(os.environ["CONTENT_CREATOR_MODELS"])
         try:
             chroma_port = int(os.environ['CHROMA_PORT'])
         except ValueError as e:

src/main.py

@@ -6,7 +6,6 @@ import string,os
 from datetime import datetime
 from dotenv import load_dotenv
 load_dotenv()
-print(os.environ["CONTENT_CREATOR_MODELS"])
 
 
 tril = tn.TrilumNotes()
@@ -30,7 +29,7 @@ for note in tril_notes:
     ai_gen = omg.OllamaGenerator(os_friendly_title,
                                  tril_notes[note]['content'],
                                  tril_notes[note]['title'])
-    blog_path = f"generated_files/{os_friendly_title}.md"
+    blog_path = f"/blog_creator/generated_files/{os_friendly_title}.md"
     ai_gen.save_to_file(blog_path)
 
 
@@ -50,10 +49,9 @@ for note in tril_notes:
     git_branch_url = f'https://git.aridgwayweb.com/armistace/blog/src/branch/{os_friendly_title}/src/content/{os_friendly_title}.md'
     n8n_system_prompt = f"You are a blog creator notifiying the final editor of the final creation of blog available at {git_branch_url}"
     n8n_prompt_human = f"""
-        Generate an informal 100 word
+        Generate an informal 150 word
         summary describing {ai_gen.response}.
-        Don't address it or use names. ONLY OUTPUT THE RESPONSE.
-        ONLY OUTPUT IN PLAINTEXT STRIP ALL MARKDOWN
+        Don't address it or use names. ONLY OUTPUT THE RESPONSE
         """
     notification_message = ai_gen.generate_system_message(n8n_system_prompt, n8n_prompt_human)
     secret_key = os.environ['N8N_SECRET']