fix merging problem

Author: Guyunjeong

README.md

@@ -46,4 +46,4 @@ def month_days(month, leap_year):
 
 day = day + localtime.tm_mday
 print("%s's age is %d years or " % (name, year), end="")
-print("%d months or %d days" % (month, day))
+print("%d months or %d days" % (month, day))

projects/Calculate Age/calculate.py

@@ -4,16 +4,16 @@
 
 def age_calculator(name, age):
     """
-        Calculate user's age in years, month, and days
-        based on current date and print.
+    Calculate user's age in years, month, and days
+    based on current date and print.
 
-        Args:
-            name (str): user's name.
-            age (int): user's age in years.
+    Args:
+        name (str): user's name.
+        age (int): user's age in years.
 
-        Returns:
-            None.
-        """
+    Returns:
+        None.
+    """
     localtime = time.localtime(time.time())
 
     year = int(age)
@@ -36,7 +36,3 @@ def age_calculator(name, age):
     day += localtime.tm_mday
 
     return f"{name}'s age is {year} years or {month} months or {day} days"
-
-
-
-

projects/Calculate Age/src/calculate_age.py

@@ -3,15 +3,15 @@
 
 def main():
     """
-        the user to input name and age, validate input,
-        and calculates and displays the user age in years, months and days.
+    the user to input name and age, validate input,
+    and calculates and displays the user age in years, months and days.
 
-        Args:
-            None.
+    Args:
+        None.
 
-        Return:
-            None.
-        """
+    Return:
+        None.
+    """
     input_name = input("input your name: ")
 
     while True:
@@ -29,7 +29,6 @@ def main():
 
     print(result)
 
+
 if __name__ == "__main__":
     main()
-
-

projects/Calculate Age/src/main.py

@@ -3,13 +3,13 @@
 
 def judge_leap_year(year):
     """
-            judge the leap year.
+        judge the leap year.
 
-        Args:
-            year (int): To check the year.
-        return:
-             bool: Ture if the year is a leap year, False otherwise.
-        """
+    Args:
+        year (int): To check the year.
+    return:
+         bool: Ture if the year is a leap year, False otherwise.
+    """
     if isleap(year):
         return True
     else:
@@ -18,14 +18,14 @@ def judge_leap_year(year):
 
 def month_days(month, leap_year):
     """
-        Returns the number of days in each month
+    Returns the number of days in each month
 
-        Args:
-             month (int): The month 1-12.
+    Args:
+         month (int): The month 1-12.
 
-        Returns:
-            int: The number of days in the month.
-        """
+    Returns:
+        int: The number of days in the month.
+    """
     if month in [1, 3, 5, 7, 8, 10, 12]:
         return 31
     elif month in [4, 6, 9, 11]:

projects/Calculate Age/src/utilize_date.py

@@ -19,4 +19,5 @@ def test_month_days():
     assert month_days(1, False) == 31
     assert month_days(11, True) == 30
 
+
 # "pytest -s test_calculate.py" to test this file

projects/Calculate Age/test_calculate.py

@@ -2,12 +2,12 @@
 from calculate_age import age_calculator
 
 
-@patch('time.time', return_value=1621848668.0)
+@patch("time.time", return_value=1621848668.0)
 def test_age_calculator(mock_time):
     """
-     Test the age_calculator function
-     Mocks the current time and check if the age is calculated
-     based on current time
+    Test the age_calculator function
+    Mocks the current time and check if the age is calculated
+    based on current time
     """
     name = "Chloe"
     age = 30

projects/Calculate Age/tests/test_calculate_age.py

@@ -4,9 +4,9 @@
 
 def test_judge_leap_year():
     """
-     judge_leap_year function tests whether a given year is a leap year.
+    judge_leap_year function tests whether a given year is a leap year.
 
-     A leap year is divisible by 4 and, if divisible by 100, must also be divisible by 400.
+    A leap year is divisible by 4 and, if divisible by 100, must also be divisible by 400.
     """
     assert judge_leap_year(2000) == True
     assert judge_leap_year(2008) == True

projects/Calculate Age/tests/test_utilize_date.py

@@ -0,0 +1,49 @@
+from openai import OpenAI
+from dotenv import load_dotenv
+import os
+
+load_dotenv(override=True)
+
+gpt_api_key = os.getenv("GPT_API_KEY")
+
+
+def gpt(model: str, prompt: str, sys_prompt: str, temp: float):
+    client = OpenAI(api_key=gpt_api_key)
+    response = client.chat.completions.create(
+        model=model,
+        messages=[
+            {"role": "system", "content": sys_prompt},
+            {"role": "user", "content": prompt},
+        ],
+        temperature=temp,
+        # max_tokens=64,
+        top_p=1,
+    )
+    output = response.choices[0].message.content.strip()
+    return output
+
+
+def dalle3(prompt: str, quality: str, size: str, style: str):
+    client = OpenAI(api_key=gpt_api_key)
+    response = client.images.generate(
+        model="dall-e-3",
+        prompt=prompt,
+        size=size,
+        quality=quality,
+        style=style,
+        n=1,
+    )
+    image_url = response.data[0].url
+    return image_url
+
+
+def dalle2(prompt: str, size: str):
+    client = OpenAI(api_key=gpt_api_key)
+    response = client.images.generate(
+        model="dall-e-2",
+        prompt=prompt,
+        size=size,
+        n=1,
+    )
+    image_url = response.data[0].url
+    return image_url

projects/Chat-GPT-Discord-Bot/Chat_GPT_Function.py

@@ -0,0 +1,14 @@
+{
+    "system_content": [
+      {
+        "character_limit_prompt": " Your response must not exceed 4096 characters", 
+        "correct_grammar": "You will be provided with user text, and your task is to only grammar check the user text and to also provide information on what you changed.",
+        "single_page_website": "Only respond to questions about making a single paged website, Ignoring other unrelated questions. Outputted code should be encased by markdown syntax. Your response should include HTML code with embedded javascript and CSS.",
+        "text_to_emoji": "You will be provided with a message, and your task is to convert each word in that user text into the appropriate emojis. Do not respond in words, only respond in emojis. Ignore punctuation",
+        "text_to_block_letters":"Your task is to convert a given message into a sequence of Discord regional indicator emojis and selected punctuation emojis. For each letter in the message, add ':regional_indicator_' before the letter and ':' after it. For exclamation points '!' and question marks '?', simply add ':' before and after the punctuation. Remove all other punctuation and characters that are not letters, exclamation points, or question marks. Preserve the original spacing between words. Here are some examples of the desired output format: ':regional_indicator_h::regional_indicator_e::regional_indicator_l::regional_indicator_l::regional_indicator_o: :regional_indicator_h::regional_indicator_o::regional_indicator_w: :regional_indicator_a::regional_indicator_r::regional_indicator_e: :regional_indicator_y::regional_indicator_o::regional_indicator_u::question:', ':regional_indicator_l::regional_indicator_e::regional_indicator_t::regional_indicator_s: :regional_indicator_g::regional_indicator_o::exclamation:'. Please strictly adhere to this format in your responses and do not deviate from or elaborate on the given instructions.",
+        "code_debug":"You will be provided with a piece of code in any programming language. Your task is to analyze the code, identify any potential bugs or issues, and fix them. If the code appears to be working correctly, explain how it works and offer any possible improvements or optimizations. Outputted code should be encased by markdown syntax. Ignore questions that don't contain code.",
+        "short_story":"You are a creative writing assistant capable of generating engaging short stories. When the user provides a topic, create a well-structured, coherent story of approximately 200-300 words. Use vivid descriptions, interesting characters, and a compelling plot to bring the story to life. Adapt your writing style to suit the given topic and ensure a satisfying conclusion.",
+        "general_questions":"You are ChatGPT, a friendly, knowledgeable, and capable AI assistant with extensive knowledge across many domains and excellent language skills. Engage in conversations on a wide range of topics, provide helpful information, and assist with various tasks such as writing, analysis, and brainstorming. Adapt your communication style to suit each user, be attentive and responsive to their needs, provide explanations and context when appropriate, share original thoughts while acknowledging differing views, encourage critical thinking, mirror the user's language style, check if responses meet expectations, and express friendly enthusiasm for their interests and ideas."
+      }
+    ]
+  }