medicafe 0.250820.1__tar.gz → 0.250820.3__tar.gz

{medicafe-0.250820.1 → medicafe-0.250820.3}/MediBot/MediBot.bat

@@ -677,7 +677,7 @@ goto main_menu
 :: Process CSV Files moved to external script
 :process_csvs
 call "%~dp0process_csvs.bat"
-goto :eof
+goto troubleshooting_menu
 
 REM [removed legacy :clear_cache block in favor of :clear_cache_menu]
 

{medicafe-0.250820.1 → medicafe-0.250820.3}/MediBot/__init__.py

@@ -19,7 +19,7 @@ Smart Import Integration:
         medibot_main = get_components('medibot_main')
 """
 
-__version__ = "0.250820.1"
+__version__ = "0.250820.3"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

{medicafe-0.250820.1 → medicafe-0.250820.3}/MediBot/update_medicafe.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # update_medicafe.py
-# Script Version: 2.0.1 (clean 3-try updater)
+# Script Version: 2.0.2 (clean 3-try updater)
 # Target environment: Windows XP SP3 + Python 3.4.4 (ASCII-only)
 
 import sys, os, time, subprocess, platform
@@ -17,7 +17,7 @@ except Exception:
 
 
 SCRIPT_NAME = "update_medicafe.py"
-SCRIPT_VERSION = "2.0.0"
+SCRIPT_VERSION = "2.0.2"
 PACKAGE_NAME = "medicafe"
 
 
@@ -81,6 +81,22 @@ def get_installed_version(package):
 
 def get_latest_version(package, retries):
     if not requests:
+        # Fallback: try pip index if requests missing (first run)
+        try:
+            proc = subprocess.Popen([sys.executable, '-m', 'pip', 'index', 'versions', package],
+                                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            out, err = proc.communicate()
+            if proc.returncode == 0:
+                # Parse a line like: Available versions: 1.2.3, 1.2.2, ... (take first)
+                for line in out.decode(errors='ignore').splitlines():
+                    if 'Available versions:' in line:
+                        parts = line.split(':', 1)
+                        if len(parts) == 2:
+                            versions = [v.strip() for v in parts[1].split(',') if v.strip()]
+                            if versions:
+                                return versions[0]
+        except Exception:
+            pass
         return None
 
     headers = {
@@ -118,11 +134,18 @@ def get_latest_version(package, retries):
 
 
 def check_internet_connection():
-    if not requests:
-        return False
+    # Prefer requests when available
+    if requests:
+        try:
+            requests.get("http://www.google.com", timeout=5)
+            return True
+        except Exception:
+            pass
+    # Fallback: use ping as a lightweight reachability check (XP compatible)
     try:
-        requests.get("http://www.google.com", timeout=5)
-        return True
+        proc = subprocess.Popen(['ping', '-n', '1', 'pypi.org'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = proc.communicate()
+        return proc.returncode == 0
     except Exception:
         return False
 
@@ -139,6 +162,8 @@ def verify_post_install(package, expected_version):
     for attempt in range(1, 6):  # Increased to 5 attempts
         installed = get_installed_version(package)
         if installed:
+            if expected_version is None:
+                return True, installed
             # Re-fetch latest once to avoid stale latest
             latest_again = get_latest_version(package, retries=1) or expected_version
             if compare_versions(installed, latest_again) >= 0:
@@ -148,6 +173,8 @@ def verify_post_install(package, expected_version):
         time.sleep(2)  # Increased to 2 seconds for better propagation on slow systems
     # Final re-fetch for robustness
     installed = get_installed_version(package)
+    if expected_version is None and installed:
+        return True, installed
     latest_again = get_latest_version(package, retries=1) or expected_version
     if installed and compare_versions(installed, latest_again) >= 0:
         return True, installed
@@ -155,6 +182,7 @@ def verify_post_install(package, expected_version):
 
 
 def upgrade_package(package):
+    # Try with [binary] first; if pip doesn't recognize it, fall back to plain package
     strategies = [
         ['install', '--upgrade', package + '[binary]', '--no-cache-dir', '--disable-pip-version-check'],
         ['install', '--upgrade', '--force-reinstall', package + '[binary]', '--no-cache-dir', '--disable-pip-version-check'],
@@ -163,8 +191,7 @@ def upgrade_package(package):
 
     latest_before = get_latest_version(package, retries=2)
     if not latest_before:
-        print_status('ERROR', 'Unable to determine latest version from PyPI')
-        return False
+        print_status('WARNING', 'Unable to determine latest version from PyPI; proceeding with blind install')
 
     for idx, parts in enumerate(strategies):
         attempt = idx + 1
@@ -184,11 +211,48 @@ def upgrade_package(package):
             # Show error output concisely
             if err:
                 print(err.strip())
+            # Detect extras error and fall back to non-binary package
+            if 'Invalid requirement' in err or 'extras' in err or '[binary]' in err:
+                print_status('INFO', 'Falling back to installing without [binary] extra')
+                fb_cmd = [sys.executable, '-m', 'pip', 'install', '--upgrade', package, '--no-cache-dir', '--disable-pip-version-check']
+                code2, out2, err2 = run_pip_install(fb_cmd)
+                if code2 == 0:
+                    ok, installed = verify_post_install(package, latest_before)
+                    if ok:
+                        print_status('SUCCESS', 'Installed without [binary]: {}'.format(installed))
+                        return True
+                if err2:
+                    print(err2.strip())
             print_status('WARNING', 'pip returned non-zero exit code ({})'.format(code))
 
     return False
 
 
+def _is_importable(module_name, submodule_name):
+    try:
+        code = 'import ' + module_name + '\nfrom ' + module_name + ' import ' + submodule_name
+        proc = subprocess.Popen([sys.executable, '-c', code], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = proc.communicate()
+        return proc.returncode == 0
+    except Exception:
+        return False
+
+
+def ensure_lxml_available():
+    if _is_importable('lxml', 'etree'):
+        return True
+    print_section('lxml check')
+    print_status('INFO', 'lxml not importable; installing pinned version')
+    code, out, err = run_pip_install([sys.executable, '-m', 'pip', 'install', '--upgrade', 'lxml==4.2.0', '--no-cache-dir', '--disable-pip-version-check'])
+    if code == 0 and _is_importable('lxml', 'etree'):
+        print_status('SUCCESS', 'lxml is now available')
+        return True
+    if err:
+        print(err.strip())
+    print_status('ERROR', 'Failed to ensure lxml is available')
+    return False
+
+
 # ---------- Main ----------
 def main():
     print_banner("MediCafe Updater ({} v{})".format(SCRIPT_NAME, SCRIPT_VERSION))
@@ -209,9 +273,9 @@ def main():
 
     latest = get_latest_version(PACKAGE_NAME, retries=3)
     if not latest:
-        print_status('ERROR', 'Could not fetch latest version information from PyPI')
-        sys.exit(1)
-    print_status('INFO', 'Latest {} on PyPI: {}'.format(PACKAGE_NAME, latest))
+        print_status('WARNING', 'Could not fetch latest version information from PyPI; attempting upgrade anyway')
+    else:
+        print_status('INFO', 'Latest {} on PyPI: {}'.format(PACKAGE_NAME, latest))
 
     if current and compare_versions(latest, current) <= 0:
         print_section('Status')
@@ -226,6 +290,8 @@ def main():
     final_version = get_installed_version(PACKAGE_NAME)
     if success:
         print_status('SUCCESS', 'Update completed. {} is now at {}'.format(PACKAGE_NAME, final_version or '(unknown)'))
+        # Ensure critical binary dependency exists for first-run stability
+        ensure_lxml_available()
         print_status('INFO', 'This updater script: v{}'.format(SCRIPT_VERSION))
         sys.exit(0)
     else:

{medicafe-0.250820.1 → medicafe-0.250820.3}/MediCafe/__init__.py

@@ -27,7 +27,7 @@ Smart Import System:
         api_suite = get_api_access()
 """
 
-__version__ = "0.250820.1"
+__version__ = "0.250820.3"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

{medicafe-0.250820.1 → medicafe-0.250820.3}/MediLink/__init__.py

@@ -22,7 +22,7 @@ Smart Import Integration:
         datamgmt = get_components('medilink_datamgmt')
 """
 
-__version__ = "0.250820.1"
+__version__ = "0.250820.3"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

{medicafe-0.250820.1 → medicafe-0.250820.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250820.1
+Version: 0.250820.3
 Summary: MediCafe
 Home-page: https://github.com/katanada2/MediCafe
 Author: Daniel Vidaud
@@ -15,6 +15,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.4, <3.5
 Description-Content-Type: text/markdown
+Provides-Extra: binary
 License-File: LICENSE
 
 # MediCafe

{medicafe-0.250820.1 → medicafe-0.250820.3}/medicafe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250820.1
+Version: 0.250820.3
 Summary: MediCafe
 Home-page: https://github.com/katanada2/MediCafe
 Author: Daniel Vidaud
@@ -15,6 +15,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.4, <3.5
 Description-Content-Type: text/markdown
+Provides-Extra: binary
 License-File: LICENSE
 
 # MediCafe

{medicafe-0.250820.1 → medicafe-0.250820.3}/medicafe.egg-info/requires.txt

@@ -12,7 +12,9 @@ numpy==1.11.3
 pandas==0.20.0
 lxml==4.2.0
 
-[:platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5" and extra == "binary"]
+[binary]
+
+[binary:platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5"]
 numpy==1.11.3
 pandas==0.20.0
 lxml==4.2.0

{medicafe-0.250820.1 → medicafe-0.250820.3}/setup.py

@@ -54,7 +54,7 @@ if long_description_text is None:
 
 setup(
     name='medicafe',
-    version="0.250820.1",
+    version="0.250820.3",
     description='MediCafe',
     long_description=long_description_text,
     long_description_content_type='text/markdown',
@@ -84,18 +84,22 @@ setup(
         'requests==2.21.0',
         'argparse==1.4.0',
         'numpy==1.11.3; platform_python_implementation != "CPython" or sys_platform != "win32" or python_version > "3.5"',
-        'numpy==1.11.3; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5" and extra == "binary"',
         'pandas==0.20.0; platform_python_implementation != "CPython" or sys_platform != "win32" or python_version > "3.5"',
-        'pandas==0.20.0; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5" and extra == "binary"',
         'tqdm==4.14.0',
         'lxml==4.2.0; platform_python_implementation != "CPython" or sys_platform != "win32" or python_version > "3.5"',
-        'lxml==4.2.0; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5" and extra == "binary"',
         'python-docx==0.8.11',
         'PyYAML==5.2',
         'chardet==3.0.4',
         'cffi==1.8.2', # msal needs this and then pip install will fail because 1.15.X won't work on XP.
         'msal==1.26.0'
     ],
+    extras_require={
+        'binary': [
+            'numpy==1.11.3; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5"',
+            'pandas==0.20.0; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5"',
+            'lxml==4.2.0; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version <= "3.5"',
+        ]
+    },
     entry_points={
         'console_scripts': [
             'medicafe=MediCafe.__main__:main',