update app

app.py

@@ -13,11 +13,11 @@ def process_image(image, margin):
 		yield [None, None, None]
 		return
 
-	color = Color.fromRgb(0xff, 0x0, 0x0)
+	color = Color.from_rgb(0xff, 0x0, 0x0)
 	cwt = ColorWheel(color)
 	colors = []
 	for t in cwt.tone15:
-		cw = ColorWheel(Color.fromRgb(t.r, t.g, t.b))
+		cw = ColorWheel(Color.from_rgb(t.r, t.g, t.b))
 		for h in cw.hue:
 			colors.append((h.r, h.g, h.b))
 
@@ -58,8 +58,8 @@ app = gr.Interface(
 		gr.Textbox(label='text'),
 	],
 	allow_flagging='never',
+	concurrency_limit=20,
 	examples=[['examples/example1.jpg', 0], ['examples/example2.jpg', 0]],
 	#cache_examples=False
 )
-app.queue(concurrency_count=20)
 app.launch()

color.py

@@ -22,11 +22,11 @@ class Color:
 		self._b = b
 
 	@staticmethod
-	def fromArgb(a, r, g, b):
+	def from_argb(a, r, g, b):
 		return Color(a, r, g, b)
 
 	@staticmethod
-	def fromRgb(r, g, b):
+	def from_rgb(r, g, b):
 		return Color(0xff, r, g, b)
 
 	def __eq__(self, other):

color_wheel.py

@@ -3,85 +3,85 @@ from color import Color
 
 class ColorWheel:
 	@property
-	def baseColor(self):
-		return self._baseColor
+	def base_color(self):
+		return self._base_color
 
 	@property
 	def hue(self):
 		return [
-			self.baseColor, self.addH(1.0 / 12), self.addH(2.0 / 12), self.addH(3.0 / 12), self.addH(4.0 / 12), self.addH(5.0 / 12),
-			self.addH(-6.0 / 12), self.addH(-5.0 / 12), self.addH(-4.0 / 12), self.addH(-3.0 / 12), self.addH(-2.0 / 12), self.addH(-1.0 / 12)
+			self.base_color, self.add_h(1.0 / 12), self.add_h(2.0 / 12), self.add_h(3.0 / 12), self.add_h(4.0 / 12), self.add_h(5.0 / 12),
+			self.add_h(-6.0 / 12), self.add_h(-5.0 / 12), self.add_h(-4.0 / 12), self.add_h(-3.0 / 12), self.add_h(-2.0 / 12), self.add_h(-1.0 / 12)
 		]
 
 	@property
 	def tone(self):
-		return [self.addWhite(-2.0 / 16), self.addWhite(-1.0 / 16), self.baseColor, self.addWhite(1.0 / 16), self.addWhite(2.0 / 16)]
+		return [self.add_white(-2.0 / 16), self.add_white(-1.0 / 16), self.base_color, self.add_white(1.0 / 16), self.add_white(2.0 / 16)]
 
 	@property
 	def tone15(self):
-		return [self.addWhite(-7.0 / 16), self.addWhite(-6.0 / 16), self.addWhite(-5.0 / 16), self.addWhite(-4.0 / 16), self.addWhite(-3.0 / 16), 
-				self.addWhite(-2.0 / 16), self.addWhite(-1.0 / 16), self.baseColor, self.addWhite(1.0 / 16), self.addWhite(2.0 / 16),
-				self.addWhite(3.0 / 16), self.addWhite(4.0 / 16), self.addWhite(5.0 / 16), self.addWhite(6.0 / 16), self.addWhite(7.0 / 16)]
+		return [self.add_white(-7.0 / 16), self.add_white(-6.0 / 16), self.add_white(-5.0 / 16), self.add_white(-4.0 / 16), self.add_white(-3.0 / 16), 
+				self.add_white(-2.0 / 16), self.add_white(-1.0 / 16), self.base_color, self.add_white(1.0 / 16), self.add_white(2.0 / 16),
+				self.add_white(3.0 / 16), self.add_white(4.0 / 16), self.add_white(5.0 / 16), self.add_white(6.0 / 16), self.add_white(7.0 / 16)]
 
 	@property
-	def complementaryColors(self):
-		return [self.baseColor, self.addH(0.5)]
+	def complementary_colors(self):
+		return [self.base_color, self.add_h(0.5)]
 
 	@property
-	def triadicColors(self):
-		return [self.addH(-4.0 / 12), self.baseColor, self.addH(4.0 / 12)]
+	def triadic_colors(self):
+		return [self.add_h(-4.0 / 12), self.base_color, self.add_h(4.0 / 12)]
 
 	@property
-	def splitComplementaryColors(self):
-		return [self.addH(-5.0 / 12), self.baseColor, self.addH(5.0 / 12)]
+	def split_complementary_colors(self):
+		return [self.add_h(-5.0 / 12), self.base_color, self.add_h(5.0 / 12)]
 
 	@property
-	def analogousColors(self):
-		return [self.addH(-2.0 / 12), self.addH(-1.0 / 12), self.baseColor, self.addH(1.0 / 12), self.addH(2.0 / 12)]
+	def analogous_colors(self):
+		return [self.add_h(-2.0 / 12), self.add_h(-1.0 / 12), self.base_color, self.add_h(1.0 / 12), self.add_h(2.0 / 12)]
 
 	def __init__(self, c):
-		self._baseColor = c
+		self._base_color = c
 		self._r = c.r / 255.0
 		self._g = c.g / 255.0
 		self._b = c.b / 255.0
 
 	@staticmethod
-	def fromHsv(h, s, v):
-		r, g, b = ColorWheel.hsvToRgb(h, s, v)
-		c = Color.fromRgb(round(r * 255), round(g * 255), round(b * 255))
+	def from_hsv(h, s, v):
+		r, g, b = ColorWheel.hsv_to_rgb(h, s, v)
+		c = Color.from_rgb(round(r * 255), round(g * 255), round(b * 255))
 		return ColorWheel(c)
 
-	def addWhite(self, value):
+	def add_white(self, value):
 		r, g, b = (self._r + value, self._g + value, self._b + value)
 		r = min(max(r, 0.0), 1.0)
 		g = min(max(g, 0.0), 1.0)
 		b = min(max(b, 0.0), 1.0)
-		return self._fromRgb(r, g, b)
+		return self._from_rgb(r, g, b)
 
-	def addH(self, value):
-		h, s, v = ColorWheel.rgbToHsv(self._r, self._g, self._b)
+	def add_h(self, value):
+		h, s, v = ColorWheel.rgb_to_hsv(self._r, self._g, self._b)
 		h = (h + value) % 1.0
 		if h < 0.0:
 			h += 1.0
-		r, g, b = ColorWheel.hsvToRgb(h, s, v)
-		return self._fromRgb(r, g, b)
+		r, g, b = ColorWheel.hsv_to_rgb(h, s, v)
+		return self._from_rgb(r, g, b)
 
-	def addS(self, value):
-		h, s, v = ColorWheel.rgbToHsv(self._r, self._g, self._b)
+	def add_s(self, value):
+		h, s, v = ColorWheel.rgb_to_hsv(self._r, self._g, self._b)
 		s += value
 		s = min(max(s, 0.0), 1.0)
-		r, g, b = ColorWheel.hsvToRgb(h, s, v)
-		return self._fromRgb(r, g, b)
+		r, g, b = ColorWheel.hsv_to_rgb(h, s, v)
+		return self._from_rgb(r, g, b)
 
-	def addV(self, value):
-		h, s, v = ColorWheel.rgbToHsv(self._r, self._g, self._b)
+	def add_v(self, value):
+		h, s, v = ColorWheel.rgb_to_hsv(self._r, self._g, self._b)
 		v += value
 		v = min(max(v, 0.0), 1.0)
-		r, g, b = ColorWheel.hsvToRgb(h, s, v)
-		return self._fromRgb(r, g, b)
+		r, g, b = ColorWheel.hsv_to_rgb(h, s, v)
+		return self._from_rgb(r, g, b)
 
 	@staticmethod
-	def rgbToHsv(r, g, b):
+	def rgb_to_hsv(r, g, b):
 		if r < 0.0 or r > 1.0:
 			raise ValueError()
 		if g < 0.0 or g > 1.0:
@@ -108,7 +108,7 @@ class ColorWheel:
 		return h, s, v
 
 	@staticmethod
-	def hsvToRgb(h, s, v):
+	def hsv_to_rgb(h, s, v):
 		if h < 0.0 or h > 1.0:
 			raise ValueError()
 		if s < 0.0 or s > 1.0:
@@ -142,5 +142,5 @@ class ColorWheel:
 				b *= 1 - s
 		return r, g, b
 
-	def _fromRgb(self, r, g, b):
-		return Color.fromArgb(self.baseColor.a, round(r * 255), round(g * 255), round(b * 255))
+	def _from_rgb(self, r, g, b):
+		return Color.from_argb(self.base_color.a, round(r * 255), round(g * 255), round(b * 255))