Skip to content

Commit

Permalink
Code-Reformat and optimize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
yorevs committed Sep 4, 2024
1 parent b9e52bc commit b1dd4d9
Show file tree
Hide file tree
Showing 67 changed files with 299 additions and 415 deletions.
9 changes: 2 additions & 7 deletions src/demo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,5 @@
# Package: demo
"""Package initialization."""

__all__ = [
'components',
'features',
'others',
'utils'
]
__version__ = '1.0.13'
__all__ = ["components", "features", "others", "utils"]
__version__ = "1.0.13"
9 changes: 2 additions & 7 deletions src/demo/components/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,5 @@
# Package: demo.components
"""Package initialization."""

__all__ = [
'camera_demo',
'internet_demo',
'summarizer_demo',
'webcam_demo'
]
__version__ = '1.0.13'
__all__ = ["camera_demo", "internet_demo", "summarizer_demo", "webcam_demo"]
__version__ = "1.0.13"
3 changes: 1 addition & 2 deletions src/demo/components/vision_demo.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from askai.core.engine.ai_vision import AIVision
from askai.core.support.shared_instances import shared

from utils import init_context

if __name__ == '__main__':
if __name__ == "__main__":
init_context("vision-demo")
vision: AIVision = shared.engine.vision()
load_dir: str = "${HOME}/.config/hhs/askai/cache/pictures/photos"
Expand Down
4 changes: 1 addition & 3 deletions src/demo/components/webcam_demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@
"""
from askai.core.features.router.tools.webcam import webcam_capturer
from hspylib.core.tools.commons import sysout

from utils import init_context

if __name__ == "__main__":
init_context("webcam-demo")
sysout("-=" * 40)
sysout("AskAI WebCam Demo")
sysout("-=" * 40)
info: str = webcam_capturer('hugo', True)
info: str = webcam_capturer("hugo", True)
# info: str = webcam_identifier()
sysout(info, markdown=True)

8 changes: 2 additions & 6 deletions src/demo/features/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,5 @@
# Package: demo.features
"""Package initialization."""

__all__ = [
'rag',
'router_demo',
'tools'
]
__version__ = '1.0.13'
__all__ = ["rag", "router_demo", "tools"]
__version__ = "1.0.13"
6 changes: 2 additions & 4 deletions src/demo/features/rag/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
# Package: demo.features.rag
"""Package initialization."""

__all__ = [
'x_refs_demo'
]
__version__ = '1.0.13'
__all__ = ["x_refs_demo"]
__version__ = "1.0.13"
6 changes: 2 additions & 4 deletions src/demo/features/tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
# Package: demo.features.tools
"""Package initialization."""

__all__ = [
'query_output_demo'
]
__version__ = '1.0.13'
__all__ = ["query_output_demo"]
__version__ = "1.0.13"
8 changes: 2 additions & 6 deletions src/demo/others/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,5 @@
# Package: demo.others
"""Package initialization."""

__all__ = [
'deepl_demo',
'tech_week_demo',
'translate_demo'
]
__version__ = '1.0.13'
__all__ = ["deepl_demo", "tech_week_demo", "translate_demo"]
__version__ = "1.0.13"
10 changes: 5 additions & 5 deletions src/demo/others/vision_model_demos.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import os
from PIL import Image
from transformers import AutoTokenizer, VisionEncoderDecoderModel, ViTImageProcessor

from transformers import VisionEncoderDecoderModel, ViTImageProcessor, AutoTokenizer
import os
import torch
from PIL import Image


class Captioner:
Expand Down Expand Up @@ -34,6 +34,6 @@ def predict_step(self, image_paths: list[str]) -> list[str]:
return preds


if __name__ == '__main__':
if __name__ == "__main__":
c = Captioner()
print(c.predict_step(['photos/webcam_photo.jpg-PHOTO.jpg']))
print(c.predict_step(["photos/webcam_photo.jpg-PHOTO.jpg"]))
6 changes: 2 additions & 4 deletions src/main/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
# Package: main
"""Package initialization."""

__all__ = [
'askai'
]
__version__ = '1.0.13'
__all__ = ["askai"]
__version__ = "1.0.13"
9 changes: 2 additions & 7 deletions src/main/askai/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,5 @@
# Package: main.askai
"""Package initialization."""

__all__ = [
'core',
'exception',
'language',
'tui'
]
__version__ = '1.0.13'
__all__ = ["core", "exception", "language", "tui"]
__version__ = "1.0.13"
30 changes: 15 additions & 15 deletions src/main/askai/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
"""Package initialization."""

__all__ = [
'askai',
'askai_cli',
'askai_configs',
'askai_events',
'askai_messages',
'askai_prompt',
'askai_settings',
'commander',
'component',
'engine',
'enums',
'features',
'model',
'support'
"askai",
"askai_cli",
"askai_configs",
"askai_events",
"askai_messages",
"askai_prompt",
"askai_settings",
"commander",
"component",
"engine",
"enums",
"features",
"model",
"support",
]
__version__ = '1.0.13'
__version__ = "1.0.13"
19 changes: 10 additions & 9 deletions src/main/askai/core/askai.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@
Copyright (c) 2024, HomeSetup
"""
import logging as log
import os
import re
import sys
from enum import Enum
from pathlib import Path
from typing import List, Optional, TypeAlias

from askai.__classpath__ import classpath
from askai.core.askai_configs import configs
from askai.core.askai_events import events
Expand All @@ -37,12 +29,20 @@
MaxInteractionsReached, TerminatingQuery)
from askai.tui.app_icons import AppIcons
from click import UsageError
from enum import Enum
from hspylib.core.enums.charset import Charset
from hspylib.core.tools.commons import file_is_not_empty, is_debugging
from hspylib.core.zoned_datetime import DATE_FORMAT, now, TIME_FORMAT
from hspylib.modules.application.exit_status import ExitStatus
from hspylib.modules.eventbus.event import Event
from openai import RateLimitError
from pathlib import Path
from typing import List, Optional, TypeAlias

import logging as log
import os
import re
import sys

QueryString: TypeAlias = str | List[str] | None

Expand Down Expand Up @@ -217,5 +217,6 @@ def _cb_mode_changed_event(self, ev: Event) -> None:
f"{msg.enter_qna()} \n"
f"```\nContext:  {ev.args.sum_path},  {ev.args.glob} \n```\n"
f"`{msg.press_esc_enter()}` \n\n"
f"> {msg.qna_welcome()}")
f"> {msg.qna_welcome()}"
)
events.reply.emit(message=sum_msg)
3 changes: 1 addition & 2 deletions src/main/askai/core/askai_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
Copyright (c) 2024, HomeSetup
"""
from pathlib import Path

from askai.core.askai import AskAi
from askai.core.askai_configs import configs
from askai.core.askai_events import *
Expand All @@ -31,6 +29,7 @@
from functools import partial
from hspylib.core.tools.commons import sysout
from hspylib.modules.eventbus.event import Event
from pathlib import Path
from threading import Thread
from typing import List, TypeAlias

Expand Down
3 changes: 2 additions & 1 deletion src/main/askai/core/askai_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ def language(self) -> Language:
settings.get("askai.preferred.language")
or locale.getlocale(locale.LC_ALL)
or os.getenv("LC_ALL", os.getenv("LC_TYPE", os.getenv("LANG")))
or Language.EN_US.idiom)
or Language.EN_US.idiom
)

@property
def encoding(self) -> Charset:
Expand Down
6 changes: 3 additions & 3 deletions src/main/askai/core/askai_messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
Copyright (c) 2024, HomeSetup
"""
import re
from functools import cached_property, lru_cache

from askai.core.askai_configs import configs
from askai.language.ai_translator import AITranslator
from askai.language.language import Language
from askai.language.translators.deep import DeepLTranslator
from functools import cached_property, lru_cache
from hspylib.core.metaclass.singleton import Singleton

import re


class AskAiMessages(metaclass=Singleton):
"""Provide access to static 'translated' messages."""
Expand Down
7 changes: 2 additions & 5 deletions src/main/askai/core/commander/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@
# Package: main.askai.core.commander
"""Package initialization."""

__all__ = [
'commander',
'commands'
]
__version__ = '1.0.13'
__all__ = ["commander", "commands"]
__version__ = "1.0.13"
18 changes: 9 additions & 9 deletions src/main/askai/core/commander/commander.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@
Copyright (c) 2024, HomeSetup
"""
import os
import re
from functools import partial
from os.path import dirname
from pathlib import Path
from string import Template
from textwrap import dedent

import click
from askai.core.askai_configs import configs
from askai.core.askai_events import ASKAI_BUS_NAME, AskAiEvents, REPLY_ERROR_EVENT, REPLY_EVENT
from askai.core.commander.commands.cache_cmd import CacheCmd
Expand All @@ -35,9 +26,18 @@
from askai.language.language import AnyLocale, Language
from click import Command, Group
from clitt.core.term.cursor import cursor
from functools import partial
from hspylib.core.enums.charset import Charset
from hspylib.core.tools.commons import sysout, to_bool
from hspylib.modules.eventbus.event import Event
from os.path import dirname
from pathlib import Path
from string import Template
from textwrap import dedent

import click
import os
import re

COMMANDER_HELP_TPL = Template(
dedent(
Expand Down
11 changes: 2 additions & 9 deletions src/main/askai/core/commander/commands/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,5 @@
# Package: main.askai.core.commander.commands
"""Package initialization."""

__all__ = [
'cache_cmd',
'camera_cmd',
'general_cmd',
'history_cmd',
'settings_cmd',
'tts_stt_cmd'
]
__version__ = '1.0.13'
__all__ = ["cache_cmd", "camera_cmd", "general_cmd", "history_cmd", "settings_cmd", "tts_stt_cmd"]
__version__ = "1.0.13"
3 changes: 1 addition & 2 deletions src/main/askai/core/commander/commands/camera_cmd.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from abc import ABC

from askai.core.askai_configs import configs
from askai.core.component.camera import camera
from askai.core.features.router.tools.webcam import webcam_identifier, webcam_capturer
from askai.core.features.router.tools.webcam import webcam_capturer, webcam_identifier
from askai.core.support.text_formatter import text_formatter
from askai.core.support.utilities import display_text
from hspylib.core.metaclass.classpath import AnyPath
Expand Down
20 changes: 10 additions & 10 deletions src/main/askai/core/component/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"""Package initialization."""

__all__ = [
'audio_player',
'cache_service',
'camera',
'geo_location',
'image_store',
'internet_service',
'recorder',
'scheduler',
'summarizer'
"audio_player",
"cache_service",
"camera",
"geo_location",
"image_store",
"internet_service",
"recorder",
"scheduler",
"summarizer",
]
__version__ = '1.0.13'
__version__ = "1.0.13"
Loading

0 comments on commit b1dd4d9

Please sign in to comment.