Some Updates

Author: Stepan-coder

examples/carousel/README.md

@@ -110,6 +110,7 @@ def send_carousel(bot: Bot, message: Message, args: tuple = None):
     card_keyboard.add_button(text="Open google.com",
                              button_type=VkKeyboardButton.OPENLINK,
                              payload="https://www.google.ru")
+    card_keyboard.add_line()
     card_keyboard.add_button(button_type=VkKeyboardButton.LOCATION)
 
     carousel.add_element(title="Card №1 title",

images/image.png

@@ -0,0 +1,3 @@
+from .bot import *
+from .send import *
+from .upload import *

quanario/quanario/__init__.py

@@ -12,12 +12,12 @@
 import traceback
 from vk_api import VkApi
 from typing import Callable, Awaitable
-from quanario.send import *
-from quanario.upload import *
-from quanario.user.user import *
-from quanario.input_message.message import *
-from quanario.message_extensions.keyboard import *
-from quanario.message_extensions.carousel import *
+from .send import *
+from .upload import *
+from .user.user import *
+from .input_message.message import *
+from .message_extensions.keyboard import *
+from .message_extensions.carousel import *
 from vk_api.bot_longpoll import VkBotLongPoll, VkBotEventType
 
 

quanario/quanario/bot.py

@@ -0,0 +1,7 @@
+from .file import *
+from .voice import *
+from .audio import *
+from .photo import *
+from .video import *
+from .message import *
+from .geoposition import *

quanario/quanario/input_message/__init__.py

@@ -8,7 +8,6 @@
 
 import os
 import urllib.request
-import quanario.upload
 from typing import Tuple
 
 

quanario/quanario/input_message/file.py

@@ -7,13 +7,13 @@
 
 
 import vk_api
+from .voice import *
+from .audio import *
+from .photo import *
+from .video import *  # Недоделано (проблемы со скачиванием)
+from .file import *
+from .geoposition import *
 from typing import Optional, Dict, List, Any
-from quanario.input_message.voice import *
-from quanario.input_message.audio import *
-from quanario.input_message.photo import *
-from quanario.input_message.video import *  # Недоделано (проблемы со скачиванием)
-from quanario.input_message.file import *
-from quanario.input_message.geoposition import *
 from vk_api.bot_longpoll import VkBotEventType
 
 

quanario/quanario/input_message/message.py

@@ -0,0 +1,2 @@
+from .carousel import *
+from .keyboard import *

quanario/quanario/message_extensions/__init__.py

@@ -10,7 +10,7 @@
 from enum import Enum
 from typing import Any, Dict, List
 from prettytable import PrettyTable
-from quanario.message_extensions.keyboard import *
+from .keyboard import *
 from vk_api.keyboard import VkKeyboard, VkKeyboardColor
 
 

quanario/quanario/message_extensions/carousel.py

@@ -11,8 +11,8 @@
 from vk_api.upload import VkUpload
 from vk_api.utils import get_random_id
 from vk_api.bot_longpoll import VkBotLongPoll, VkBotEventType
-from quanario.message_extensions.keyboard import *
-from quanario.message_extensions.carousel import *
+from .message_extensions.keyboard import *
+from .message_extensions.carousel import *
 
 
 class Send:

quanario/quanario/send.py

@@ -0,0 +1,11 @@
+from .user import *
+from .params import *
+from .career import *
+from .military import *
+from .contacts import *
+from .counters import *
+from .interests import *
+from .last_seen import *
+from .education import *
+from .occupation import *
+from .lifeposition import *

quanario/quanario/user/__init__.py

@@ -0,0 +1,3 @@
+from .schools import *
+from .education import *
+from .universities import *

quanario/quanario/user/education/__init__.py

@@ -6,8 +6,8 @@
 """
 
 
-from quanario.user.education.schools import *
-from quanario.user.education.universities import *
+from .schools import *
+from .universities import *
 from typing import Dict, Any, List, Optional
 
 

quanario/quanario/user/education/education.py

@@ -8,7 +8,7 @@
 
 import json
 from enum import Enum
-from quanario.user.last_seen import *
+from .last_seen import *
 from typing import Dict, Any, List, Optional
 
 

quanario/quanario/user/params.py

@@ -4,18 +4,17 @@
 :copyright: (c) 2022 Stepan-coder
 :link: https://github.com/Stepan-coder/Quanario_VK
 """
-
-
+import time
 from enum import Enum
-from quanario.user.params import *
-from quanario.user.career import *
-from quanario.user.military import *
-from quanario.user.counters import *
-from quanario.user.contacts import *
-from quanario.user.interests import *
-from quanario.user.occupation import *
-from quanario.user.lifeposition import *
-from quanario.user.education.education import *
+from .params import *
+from .career import *
+from .military import *
+from .counters import *
+from .contacts import *
+from .interests import *
+from .occupation import *
+from .lifeposition import *
+from .education.education import *
 from typing import Dict, Any, List, Optional
 
 
@@ -224,24 +223,25 @@ def get_json(self, is_full: bool = False) -> json:
         :ru Этот метод формирует json объект из полей класса 'User'.
         :en This method generates a json object from the fields of the 'User' class.
         """
+        t1 = time.time()
         if self.education.schools is not None:
-            schools_id =[school.json() if is_full else school.id for school in self.education.schools]
+            schools_id =[school.get_json() if is_full else school.id for school in self.education.schools]
         else:
             schools_id = self.education.schools
         if self.education.universities is not None:
-            uni_id = [university.json() if is_full else university.id for university in self.education.universities]
+            uni_id = [university.get_json() if is_full else university.id for university in self.education.universities]
         else:
             uni_id = self.education.universities
         if self.career is not None:
             for career in self.career:
                 if is_full:
-                    user_career = career.json()
+                    user_career = career.get_json()
                 else:
                     user_career = career.company if career.company is not None else career.group_id
         else:
             user_career = self.career
         if self.military is not None:
-            military = [military.json() if is_full else military.unit_id for military in self.military]
+            military = [military.get_json() if is_full else military.unit_id for military in self.military]
         else:
             military = self.military
         main_info = {"id": self.user_id,
@@ -265,6 +265,7 @@ def get_json(self, is_full: bool = False) -> json:
                       "military": military}
         life_position = self.life_position.get_json()
         params = self.params.get_json()
+        print(time.time() - t1)
         return {**main_info,
                 **count,
                 **occupation,