merge conflict solution shit

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.12
+WORKDIR /app
+
+COPY ./requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY ./main.py ./
+COPY ./tools.py ./
+COPY ./.env ./
+
+RUN useradd app
+USER app
+CMD ["python", "main.py"]

README.md

@@ -9,5 +9,5 @@ A search engine in your discord client.
 - [ ] System Prompt & Safety
 - [ ] Ephermal
 - [ ] Research
-- [ ] Image creation(?)
 - [ ] VC capabilities (difficult af to implement)
+- [ ] ~~Image creation~~ (thrown out due to payment requirements) 

main.py

@@ -15,7 +15,30 @@ load_dotenv()
 
 client = genai.Client(api_key=os.getenv("GEM_API_KEY"))
 config = types.GenerateContentConfig(
-    tools=[searxng, open_url, run_command]
+    tools=[searxng, open_url, run_command],
+    safety_settings=[
+        types.SafetySetting(
+            category=types.HarmCategory.HARM_CATEGORY_CIVIC_INTEGRITY,
+            threshold=types.HarmBlockThreshold.BLOCK_NONE
+        ),
+        types.SafetySetting(
+            category=types.HarmCategory.HARM_CATEGORY_HARASSMENT,
+            threshold=types.HarmBlockThreshold.BLOCK_NONE
+        ),
+        types.SafetySetting(
+            category=types.HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
+            threshold=types.HarmBlockThreshold.BLOCK_NONE
+        ),
+        types.SafetySetting(
+            category=types.HarmCategory.HARM_CATEGORY_HATE_SPEECH,
+            threshold=types.HarmBlockThreshold.BLOCK_NONE
+        ),
+        types.SafetySetting(
+            category=types.HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
+            threshold=types.HarmBlockThreshold.BLOCK_NONE
+        ),
+
+    ]
 )
 intents = discord.Intents.default()
 intents.message_content = True

requirements.txt

@@ -2,3 +2,4 @@ google-genai
 python-dotenv
 discord.py
 markdownify
+aiohttp