Spaces:
Running
Running
Improvements
Browse files- modules/m_connector.py +12 -1
- modules/m_datetime.py +24 -0
modules/m_connector.py
CHANGED
@@ -1,18 +1,28 @@
|
|
1 |
from typing import Tuple
|
2 |
from modules.m_active_voice import ActiveVoice
|
3 |
from modules.m_htmlrender import HtmlRender
|
|
|
4 |
|
5 |
class Connector:
|
6 |
def __init__(
|
7 |
self
|
8 |
) -> None:
|
9 |
|
|
|
10 |
self.avoice = ActiveVoice()
|
11 |
self.html = HtmlRender()
|
12 |
self.cache_sentence = None
|
13 |
self.cache_html_format = None
|
14 |
self.cache_str_format = None
|
15 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
16 |
def active2passive(
|
17 |
self,
|
18 |
sentence: str
|
@@ -35,5 +45,6 @@ class Connector:
|
|
35 |
self.cache_sentence = sentence
|
36 |
self.cache_str_format = f"{data['subj']} {data['tobe']} {data['participle']} {data['agent']} {data['compl']}"
|
37 |
self.cache_html_format = self.html.output(f"{subj} {tobe} {participle} {agent} {compl}")
|
38 |
-
|
|
|
39 |
return self.cache_html_format, self.cache_str_format
|
|
|
1 |
from typing import Tuple
|
2 |
from modules.m_active_voice import ActiveVoice
|
3 |
from modules.m_htmlrender import HtmlRender
|
4 |
+
from modules.m_datetime import Datetime
|
5 |
|
6 |
class Connector:
|
7 |
def __init__(
|
8 |
self
|
9 |
) -> None:
|
10 |
|
11 |
+
self.date = Datetime()
|
12 |
self.avoice = ActiveVoice()
|
13 |
self.html = HtmlRender()
|
14 |
self.cache_sentence = None
|
15 |
self.cache_html_format = None
|
16 |
self.cache_str_format = None
|
17 |
|
18 |
+
def view_conversion(
|
19 |
+
self,
|
20 |
+
active_sent: str,
|
21 |
+
passive_sent: str
|
22 |
+
) -> None:
|
23 |
+
|
24 |
+
print(f".goat: {self.date.full()} - '{active_sent}' -> '{passive_sent}'")
|
25 |
+
|
26 |
def active2passive(
|
27 |
self,
|
28 |
sentence: str
|
|
|
45 |
self.cache_sentence = sentence
|
46 |
self.cache_str_format = f"{data['subj']} {data['tobe']} {data['participle']} {data['agent']} {data['compl']}"
|
47 |
self.cache_html_format = self.html.output(f"{subj} {tobe} {participle} {agent} {compl}")
|
48 |
+
self.view_conversion(self.cache_sentence, self.cache_str_format)
|
49 |
+
|
50 |
return self.cache_html_format, self.cache_str_format
|
modules/m_datetime.py
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
import pytz
|
2 |
+
from datetime import datetime
|
3 |
+
|
4 |
+
class Datetime:
|
5 |
+
def __init__(
|
6 |
+
self,
|
7 |
+
zone: str = "America/Argentina/Cordoba"
|
8 |
+
) -> None:
|
9 |
+
|
10 |
+
self.time_zone = pytz.timezone(zone)
|
11 |
+
|
12 |
+
def full(
|
13 |
+
self
|
14 |
+
) -> str:
|
15 |
+
|
16 |
+
now = datetime.now(self.time_zone)
|
17 |
+
return now.strftime("%H:%M:%S %d-%m-%Y")
|
18 |
+
|
19 |
+
def day(
|
20 |
+
self
|
21 |
+
) -> str:
|
22 |
+
|
23 |
+
now = datetime.now(self.time_zone)
|
24 |
+
return now.strftime("%d-%m-%Y")
|