Fix interactive mode on Windows OS

Update requirements.txt
thevickypedia · Mar 23, 2023 · e24e446 · e24e446
1 parent 3ed0303
commit e24e446
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 32 deletions.
diff --git a/docs/genindex.html b/docs/genindex.html
@@ -319,8 +319,6 @@ <h2 id="P">P</h2>
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="index.html#jarvis_ui.modules.models.EnvConfig.parse_microphone_index">parse_microphone_index() (jarvis_ui.modules.models.EnvConfig class method)</a>
-</li>
-      <li><a href="index.html#jarvis_ui.modules.models.Settings.pid">pid (jarvis_ui.modules.models.Settings attribute)</a>
 </li>
       <li><a href="index.html#jarvis_ui.modules.playsound.PlayAudio.play">play() (jarvis_ui.modules.playsound.PlayAudio method)</a>
 </li>
@@ -369,8 +367,6 @@ <h2 id="R">R</h2>
       <li><a href="index.html#jarvis_ui.modules.models.RestartTimer">RestartTimer (class in jarvis_ui.modules.models)</a>
 </li>
       <li><a href="index.html#jarvis_ui.modules.playsound.PlayAudio.run">run() (jarvis_ui.modules.playsound.PlayAudio method)</a>
-</li>
-      <li><a href="index.html#jarvis_ui.modules.models.Settings.runenv">runenv (jarvis_ui.modules.models.Settings attribute)</a>
 </li>
   </ul></td>
 </tr></table>

diff --git a/docs/index.html b/docs/index.html
@@ -430,16 +430,6 @@ <h1>Models<a class="headerlink" href="#models" title="Permalink to this heading"
 <span class="sig-name descname"><span class="pre">operating_system</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="pre">str</span></em><a class="headerlink" href="#jarvis_ui.modules.models.Settings.operating_system" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
-<dl class="py attribute">
-<dt class="sig sig-object py" id="jarvis_ui.modules.models.Settings.pid">
-<span class="sig-name descname"><span class="pre">pid</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="pre">PositiveInt</span></em><a class="headerlink" href="#jarvis_ui.modules.models.Settings.pid" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="py attribute">
-<dt class="sig sig-object py" id="jarvis_ui.modules.models.Settings.runenv">
-<span class="sig-name descname"><span class="pre">runenv</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="pre">str</span></em><a class="headerlink" href="#jarvis_ui.modules.models.Settings.runenv" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
 <dl class="py attribute">
 <dt class="sig sig-object py" id="jarvis_ui.modules.models.Settings.wake_words">
 <span class="sig-name descname"><span class="pre">wake_words</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="pre">Optional</span><span class="p"><span class="pre">[</span></span><span class="pre">List</span><span class="p"><span class="pre">[</span></span><span class="pre">str</span><span class="p"><span class="pre">]</span></span><span class="p"><span class="pre">]</span></span></em><a class="headerlink" href="#jarvis_ui.modules.models.Settings.wake_words" title="Permalink to this definition">¶</a></dt>

diff --git a/docs/objects.inv b/docs/objects.inv
diff --git a/docs/searchindex.js b/docs/searchindex.js
diff --git a/jarvis_ui/__init__.py b/jarvis_ui/__init__.py
@@ -2,7 +2,7 @@
 
 from pynotification import pynotifier
 
-version = "0.5.3"
+version = "0.5.4"
 
 try:
     import pvporcupine  # noqa

diff --git a/jarvis_ui/executables/helper.py b/jarvis_ui/executables/helper.py
@@ -73,7 +73,7 @@ def time_converter(second: float) -> str:
 
 def flush_screen() -> NoReturn:
     """Flushes the screen output."""
-    if models.settings.ide:
-        sys.stdout.write("\r")
-    else:
+    if models.settings.interactive:
         sys.stdout.write(f"\r{' '.join(['' for _ in range(os.get_terminal_size().columns)])}")
+    else:
+        sys.stdout.write("\r")
diff --git a/jarvis_ui/lib/requirements.txt b/jarvis_ui/lib/requirements.txt
@@ -3,7 +3,6 @@ SpeechRecognition==3.8.1  # Do not upgrade, no functional upgrade in latest vers
 pyttsx3==2.90
 inflect==6.0.2
 requests>=2.28.2
-pydantic[dotenv,email]==1.10.6
+pydantic[dotenv,email]==1.10.7
 PyYAML
-pynotification
-psutil==5.9.4
+pynotification
diff --git a/jarvis_ui/modules/models.py b/jarvis_ui/modules/models.py
@@ -5,13 +5,12 @@
 import os
 import platform
 import string
+import sys
 from collections import ChainMap
 from datetime import datetime
 from enum import Enum
-from multiprocessing import current_process
 from typing import List, Optional, Union
 
-import psutil
 import pyttsx3
 from packaging.version import parse as parser
 from pydantic import (BaseSettings, Field, FilePath, HttpUrl, PositiveFloat,
@@ -64,15 +63,10 @@ class Settings(BaseSettings):
     legacy: bool = True if os == "Darwin" and parser(platform.mac_ver()[0]) < parser('10.14') else False
     bot: str = "jarvis"
     wake_words: Optional[List[str]]
-    if current_process().name == 'MainProcess':
-        pid: PositiveInt = os.getpid()
+    if sys.stdin.isatty():
+        interactive = True
     else:
-        pid: PositiveInt = os.getppid()
-    runenv: str = psutil.Process(pid).parent().name()
-    if runenv.endswith('sh'):
-        ide = False
-    else:
-        ide = True
+        interactive = False
 
 
 settings = Settings()

diff --git a/release_notes.rst b/release_notes.rst
@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+0.5.4 (03/22/2023)
+------------------
+- Fix interactive mode on Windows OS
+- Update requirements.txt
+
 0.5.3 (03/22/2023)
 ------------------
 - Fix static IDE identifier on child processes