ducky-python-module 0.1.2__tar.gz → 0.1.3__tar.gz

{ducky_python_module-0.1.2 → ducky_python_module-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducky-python-module
-Version: 0.1.2
+Version: 0.1.3
 Summary: Ducky Python module
 Author: Tom
 License: Creative Commons Attribution-NonCommercial 4.0 International Public

{ducky_python_module-0.1.2 → ducky_python_module-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ducky-python-module"
-version = "0.1.2"
+version = "0.1.3"
 description = "Ducky Python module"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -27,3 +27,4 @@ where = ["src"]
 [project.urls]
 Repository = "https://github.com/ScubaKINGduck/Ducky-Python-Module"
 Issues = "https://github.com/ScubaKINGduck/Ducky-Python-Module/issues"
+

{ducky_python_module-0.1.2 → ducky_python_module-0.1.3}/src/ducky/main.py

@@ -1,10 +1,11 @@
-import random, time, os, nltk, tkinter as TK, types, math, inspect, sys, requests, json, numpy
+import random, time, os, nltk, tkinter as TK, types, math, inspect, sys, requests, json, numpy, ast, logging
 from os.path import isfile, split, join
 from copy import deepcopy
 from tkinter import simpledialog
 from turtle import Turtle
 from nltk.tokenize import word_tokenize
 from nltk.stem import LancasterStemmer
+logging.basicConfig(level=logging.INFO)
 
 #matrix functions
 
@@ -17,21 +18,21 @@ def draw(mat,x,y,val=1,errors=True): #draws a certain value to all specified pos
         try:
             for i,x_pos in enumerate(x):
                 mat[y[i]][x_pos] = val
-        except Exception as e:
+        except (ValueError,IndexError) as e:
             if errors:
                 print(e)
     else:
-        print(f"Mat:\t{mat}\nX:\t{x}\nY:\t{y}")
+        print(f"Lengths aren't equal: Mat Rows: {len(mat)}, X: {len(x)}, Y: {len(y)}")
     return mat
 
 def scan(mat,condition=1): #returns all locations that meet a certain condition
     x = []
     y = []
-    for yindex,Y in enumerate(mat):
-        for xindex,X in enumerate(mat[yindex]):
+    for y_index,Y in enumerate(mat):
+        for x_index,X in enumerate(mat[y_index]):
             if X == condition:
-                x.append(xindex)
-                y.append(yindex)
+                x.append(x_index)
+                y.append(y_index)
     return x,y
 
 def shift(mat,x,y,x_shift,y_shift=0):
@@ -72,8 +73,8 @@ def render(mat):
     
 #my functions
     
-def duckint(min,max):
-    return random.randint(min,max)
+def rand_int(minimum,maximum):
+    return random.randint(minimum,maximum)
 
 def choose(list_input):
     return random.choice(list_input)
@@ -98,55 +99,69 @@ def stem(string):
     lancaster = LancasterStemmer()
     return lancaster.stem(string)
     
-def array(list):
-    return numpy.array(list)
-
-def add(a,b):
-    return a + b
-
-def subtract(a,b):
-    return a - b
-
-def multiply(a,b):
-    return a * b
-
-def divide(a,b):
-    return a / b
+def array(lst):
+    return numpy.array(lst)
 
 def calc(param):
     try:
-        return eval(param)
-    except Exception as e:
+        return ast.literal_eval(param)
+    except (ValueError,SyntaxError) as e:
+        logging.error(f"Error evaluating expression: {e}")
         return e
 
-def find_total(number): #adds all numbers below it above 0 (including itself) e.g. find_total(5) = 5+4+3+2+1 = 15
+def find_total(number,condition=None): #adds all numbers below it that meet a certain condition
     if number < 1:
         return 0
-    else:
-        return number + find_total(number - 1)
-    
-def find_sum_of_evens(number): #adds all even numbers below it above 0 (including itself but only if it's even) e.g find_sum_of_evens(5) = 4+2 = 6
-    if number < 1:
-        return 0
-    elif number % 2 == 0:
-        return number + find_sum_of_evens(number - 2)
-    else:
-        return find_sum_of_evens(number - 1)
+    total = 0
+    for n in range(1, number + 1):
+        if condition is None or condition(n):
+            total += n
+    return total
     
-def ask(url):
+def ask_url(url):
     return requests.get(url)
 
 def ask_json(url):
     return requests.get(url).json()
 
-def locate():
-    response = requests.get('https://ipinfo.io')
-    coords = response.text.strip()
-    return coords
-
-def perf_counter():
+def get_coords():
+    response = requests.get("https://ipinfo.io/json", timeout=5)
+    response.raise_for_status()
+    data = response.json()
+    loc = data.get("loc")  # "lat,lon"
+    if loc:
+        lat, lon = map(float, loc.split(","))
+        return lat, lon
+    return None
+
+def get_time():
     return time.perf_counter()
 
+#my decorators
+
+def time_function(func):
+    def wrapper(*args, **kwargs):
+        start = get_time()
+        result = func(*args, **kwargs)
+        end = get_time()
+        execution_time = end - start
+        return result, execution_time
+    return wrapper
+
+def repeat(times):
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            results = []
+            for _ in range(times):
+                result = func(*args, **kwargs)
+                results.append(result)
+            return results
+        return wrapper
+    return decorator
+
+def modify(func,modifier):
+    return modifier(func())
+
 #classes
 
 class MatrixManager:
@@ -210,19 +225,30 @@ class Manage:
         else:
             print("Error, invalid choice:\n")
     def write_to_file(self):
-        with open(self.file,"w") as file:
-            file.write(input(f"What do you want to write to the file?\n"))
+        try:
+            with open(self.file,"w") as file:
+                file.write(input(f"What do you want to write to the file?\n"))
+        except Exception as e:
+            logging.error(f"Failed to write to {self.file}: {e}")
 
     def append_to_file(self):
-        with open(self.file,"a") as file:
-            file.write(input(f"What do you want to append to the file?\n"))
+        try:
+            with open(self.file,"a") as file:
+                file.write(input(f"What do you want to append to the file?\n"))
+        except Exception as e:
+            logging.error(f"Failed to append to {self.file}: {e}")
+            return None
 
     def delete_a_file(self):
         if input("Are you sure ('y') ?:\n") == "y":
             os.remove(self.file)
     def read_from_file(self):
-        with open(self.file,"r") as file:
-            return file.read()
+        try:
+            with open(self.file,"r") as file:
+                return file.read()
+        except Exception as e:
+            logging.error(f"Failed to read from {self.file}: {e}")
+            return None
 
 
 class TurtleManager:
@@ -315,7 +341,7 @@ class Chatbot:
         elif score[3] > score[0] and score[3] > score[1] and score[3] > score[2] and score[3] > score[4]:
             return "How may I assist you?"
         elif score[4] > score[0] and score[4] > score[1] and score[4] > score[2] and score[4] > score[3]:
-            return f"Locational data:\n{locate()}"
+            return f"Your current coordinates are:\n{get_coords()}"
         return None
 
     def reply_test(self):
@@ -324,9 +350,8 @@ class Chatbot:
                 if self.reply(self.testing_input[test]) != self.testing_output[test]:
                     return 0
             return 1
+        return None
 
-def perf_counter():
-    return time.perf_counter()
 #turtlel
       
 def dots(turt_name, number, random_colours=True, colours=None, minimum=20, maximum=100):
@@ -334,10 +359,10 @@ def dots(turt_name, number, random_colours=True, colours=None, minimum=20, maxim
         colours = ["black"]
     turt_name.penup()
     for num in range(number):
-        turt_name.goto(duckint(-250,250),duckint(-250,250))
+        turt_name.goto(rand_int(-250,250),rand_int(-250,250))
         if random_colours == True and colours:
             turt_name.pencolour(choose(colours))
-            turt_name.dot(duckint(minimum,maximum))
+            turt_name.dot(rand_int(minimum,maximum))
             
 def target_board(t_name):
     t_name.dot(610,"black")
@@ -368,14 +393,14 @@ def splat(t,num):
     for i in range(num):
         for ii in range(num):
             star(t,colour="yellow",size=100,width=50)
-            t.forward(duckint(30,60))
-            t.right(360/num+duckint(1,10))
+            t.forward(rand_int(30,60))
+            t.right(360/num+rand_int(1,10))
         t.forward(num*i)
         for iii in range(num):
             star(t,colour="yellow",size=100,width=50)
             t.forward(num*10)
-            t.right(360/num+duckint(1,10))
-        t.right(3**i*duckint(1,10))
+            t.right(360/num+rand_int(1,10))
+        t.right(3**i*rand_int(1,10))
     
 def pizza(t,x=0,y=0,size=1):
     t.penup()
@@ -388,9 +413,9 @@ def pizza(t,x=0,y=0,size=1):
     t.colour("yellow")
     t.dot(28*size)
     t.colour("red")
-    for i in range(duckint(10,15)):
-        t.goto(duckint(x+-100,x+100),duckint(y+-100,y+100))
-        t.dot(duckint(25,30))
+    for i in range(rand_int(10,15)):
+        t.goto(rand_int(x+-100,x+100),rand_int(y+-100,y+100))
+        t.dot(rand_int(25,30))
     t.goto(x,y)
     t.colour("white")
     t.pendown()

{ducky_python_module-0.1.2 → ducky_python_module-0.1.3}/src/ducky_python_module.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducky-python-module
-Version: 0.1.2
+Version: 0.1.3
 Summary: Ducky Python module
 Author: Tom
 License: Creative Commons Attribution-NonCommercial 4.0 International Public