jgtml 0.0.332__tar.gz → 0.0.334__tar.gz

{jgtml-0.0.332/jgtml.egg-info → jgtml-0.0.334}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jgtml
-Version: 0.0.332
+Version: 0.0.334
 Summary: JGT Ml - Machine Learning Tools
 Home-page: https://github.com/jgwill/jgtml
 Author: GUillaume Isabelle
@@ -17,7 +17,7 @@ License-File: LICENSE
 Requires-Dist: pandas>=0.25.1
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: python-dotenv>=0.19.2
-Requires-Dist: jgtpy>=0.5.113
+Requires-Dist: jgtpy>=0.5.116
 Requires-Dist: matplotlib>=3.3.1
 Requires-Dist: plotly>=5.18.0
 Requires-Dist: mplfinance>=0.12.10b0

{jgtml-0.0.332 → jgtml-0.0.334}/jgtml/__init__.py

@@ -1,5 +1,5 @@
 # jgtml
-version='0.0.332'
+version='0.0.334'
 import sys
 import os
 

{jgtml-0.0.332 → jgtml-0.0.334}/jgtml/jgtapp.py

@@ -538,14 +538,27 @@ def tide(instrument, timeframe, buysell, type='tide', quiet=False):
     # Restore original argv
     sys.argv = original_argv
 
-def pds(instrument, timeframe,use_full=True):
-  use_full_arg = '--full' if use_full else ''
-  subprocess.run([PDSCLI_PROG_NAME, '-i', instrument, '-t', timeframe, use_full_arg], check=True)
+def pds(instrument, timeframe, use_full=True):
+  """Generate PDS data via `pdscli`."""
+  use_full_arg = '-uf' if use_full else '-nf'
+  subprocess.run([
+      PDSCLI_PROG_NAME,
+      '-i', instrument,
+      '-t', timeframe,
+      use_full_arg,
+  ], check=True)
 
-def cds(instrument, timeframe, use_fresh=False,use_full=True):
-  use_full_arg = '--full' if use_full else ''
-  old_or_fresh = '-old' if not use_fresh else '--fresh'
-  subprocess.run([CDSCLI_PROG_NAME, '-i', instrument, '-t', timeframe,use_full_arg, old_or_fresh], check=True)
+def cds(instrument, timeframe, use_fresh=False, use_full=True):
+  """Generate CDS data using `cdscli`."""
+  use_full_arg = '-uf' if use_full else '-nf'
+  old_or_fresh = '--fresh' if use_fresh else '-old'
+  subprocess.run([
+      CDSCLI_PROG_NAME,
+      '-i', instrument,
+      '-t', timeframe,
+      use_full_arg,
+      old_or_fresh,
+  ], check=True)
 
 def ads(instrument, timeframe, use_fresh=False,tc=True,pov=False):
   old_or_fresh = '-old' if not use_fresh else '--fresh'
@@ -558,24 +571,48 @@ def ads(instrument, timeframe, use_fresh=False,tc=True,pov=False):
     ads_cli_args.append('cp')
   subprocess.run(ads_cli_args, check=True)
 
-def ocds(instrument, timeframe,use_full=True):
-  use_full_arg = '--full' if use_full else ''
-  subprocess.run([JGTCLI_PROG_NAME, '-i', instrument, '-t', timeframe, use_full_arg, '-old'], check=True)
+def ocds(instrument, timeframe, use_full=True):
+  """Generate old CDS data via `jgtcli`."""
+  use_full_arg = '-uf' if use_full else '-nf'
+  subprocess.run([
+      JGTCLI_PROG_NAME,
+      '-i', instrument,
+      '-t', timeframe,
+      use_full_arg,
+      '-old',
+  ], check=True)
 
   
-def ttf(instrument, timeframe,pn="ttf",use_fresh=False,use_full=True):
-  use_full_arg = '--full' if use_full else ''
-  use_fresh_arg = '-old' if not use_fresh else '--fresh'
-  
-  ttf_args = [TTFCLI_PROG_NAME, '-i', instrument, '-t', timeframe, use_full_arg, use_fresh_arg, '-pn', pn]
+def ttf(instrument, timeframe, pn="ttf", use_fresh=False, use_full=True):
+  """Run TTFCLI for the specified instrument and timeframe."""
+  use_full_arg = '-uf' if use_full else '-nf'
+  use_fresh_arg = '--fresh' if use_fresh else '-old'
+
+  ttf_args = [
+      TTFCLI_PROG_NAME,
+      '-i', instrument,
+      '-t', timeframe,
+      use_full_arg,
+      use_fresh_arg,
+      '-pn', pn,
+  ]
   print("TTF is being ran by jgtapp with args: ", ttf_args)
   subprocess.run(ttf_args, check=True)
 
 
-def mlf(instrument, timeframe,pn="ttf",total_lagging_periods=5,use_fresh=False,use_full=True):
-  use_full_arg = '--full' if use_full else ''
-  use_fresh_arg = '-old' if not use_fresh else '--fresh'
-  mlf_args = [MLFCLI_PROG_NAME, '-i', instrument, '-t', timeframe, use_full_arg, use_fresh_arg, '-pn', pn,'--total_lagging_periods',total_lagging_periods]
+def mlf(instrument, timeframe, pn="ttf", total_lagging_periods=5, use_fresh=False, use_full=True):
+  """Run MLFCLI to generate FDB-based patterns."""
+  use_full_arg = '-uf' if use_full else '-nf'
+  use_fresh_arg = '--fresh' if use_fresh else '-old'
+  mlf_args = [
+      MLFCLI_PROG_NAME,
+      '-i', instrument,
+      '-t', timeframe,
+      use_full_arg,
+      use_fresh_arg,
+      '-pn', pn,
+      '--total_lagging_periods', total_lagging_periods,
+  ]
   subprocess.run(mlf_args, check=True)
 
   

jgtml-0.0.334/jgtml/simple_trading_orchestrator.py

@@ -0,0 +1,261 @@
+#!/usr/bin/env python3
+
+"""
+Simple JGT Trading System Orchestrator
+
+This module orchestrates the complete JGT trading system without external dependencies
+for immediate testing and background service use.
+"""
+
+import argparse
+import subprocess
+import time
+from typing import List
+
+
+class SimpleTradingOrchestrator:
+    """Simple trading system orchestrator using existing JGT components."""
+    
+    def __init__(self, timeframe: str, instruments: List[str], 
+                 quality_threshold: float = 8.0, demo: bool = True, test_mode: bool = False):
+        self.timeframe = timeframe
+        self.instruments = instruments
+        self.quality_threshold = quality_threshold
+        self.demo = demo
+        self.test_mode = test_mode
+        
+        print(f"🚀 Simple JGT Trading Orchestrator Initialized")
+        print(f"📊 Timeframe: {timeframe} | Instruments: {','.join(instruments)}")
+        if test_mode:
+            print("⚡ TEST MODE ENABLED")
+    
+    def run_enhanced_trading_analysis(self) -> bool:
+        """Run enhanced trading CLI analysis."""
+        try:
+            instruments_str = ','.join(self.instruments)
+            mode_flag = '--demo' if self.demo else '--real'
+            
+            cmd = [
+                'enhancedtradingcli', 'auto', 
+                '-i', instruments_str,
+                mode_flag,
+                '--quality-threshold', str(self.quality_threshold)
+            ]
+            
+            print(f"🔍 Running: {' '.join(cmd)}")
+            print("📊 Note: Cache warnings are normal - Enhanced CLI handles data refresh internally")
+            result = subprocess.run(cmd, text=True)
+            
+            if result.returncode == 0:
+                print("✅ Enhanced trading analysis completed")
+                return True
+            else:
+                print(f"❌ Analysis failed with return code: {result.returncode}")
+                return False
+                
+        except Exception as e:
+            print(f"❌ Error: {e}")
+            return False
+    
+    def generate_analysis_charts(self) -> bool:
+        """Generate analysis charts for all instruments."""
+        success_count = 0
+        
+        for instrument in self.instruments:
+            try:
+                print(f"📈 Generating chart for {instrument} {self.timeframe}")
+                
+                cmd = [
+                    'jgtads', '-i', instrument, '-t', self.timeframe,
+                    '--save_figure', 'charts/',
+                    '--save_figure_as_timeframe'
+                ]
+                
+                result = subprocess.run(cmd, capture_output=True, text=True)
+                
+                if result.returncode == 0:
+                    print(f"✅ Chart generated for {instrument}")
+                    success_count += 1
+                else:
+                    print(f"⚠️  Chart generation failed for {instrument}: {result.stderr}")
+                    
+            except Exception as e:
+                print(f"❌ Error generating chart for {instrument}: {e}")
+        
+        return success_count > 0
+    
+    def update_trailing_stops(self) -> bool:
+        """Update trailing stops for active trades."""
+        try:
+            mode_flag = '--demo' if self.demo else '--real'
+            
+            # Refresh trade data
+            cmd_refresh = ['jgtapp', 'fxtr', mode_flag]
+            print("🔄 Refreshing trade data...")
+            
+            result = subprocess.run(cmd_refresh, capture_output=True, text=True)
+            if result.returncode != 0:
+                print("⚠️  No active trades found or trade data unavailable")
+                return False
+            
+            print("✅ Trade data refreshed")
+            
+            # Update FDB-based trailing stops with Alligator fallback
+            print("🐊 Updating FDB-based trailing stops with Alligator fallback...")
+            cmd_stops = ['jgtapp', 'fxmvstopfdb', '-t', self.timeframe, '--lips', mode_flag]
+            
+            result = subprocess.run(cmd_stops, capture_output=True, text=True)
+            if result.returncode == 0:
+                print("✅ FDB trailing stops updated")
+                return True
+            else:
+                print(f"⚠️  FDB trailing stops update failed: {result.stderr}")
+                return False
+                
+        except Exception as e:
+            print(f"❌ Error updating trailing stops: {e}")
+            return False
+    
+    def process_timeframe_trigger(self) -> bool:
+        """Process actions when timeframe is triggered."""
+        print(f"🎯 Processing {self.timeframe} timeframe trigger...")
+        
+        if self.timeframe in ["H4", "H1", "D1"]:
+            print("📈 PRIMARY MARKET ANALYSIS MODE")
+            
+            # Step 1: Enhanced trading analysis
+            if not self.run_enhanced_trading_analysis():
+                return False
+            
+            # Step 2: Generate analysis charts
+            if not self.generate_analysis_charts():
+                print("⚠️  Chart generation had issues but continuing...")
+            
+            return True
+            
+        elif self.timeframe in ["m15", "m5"]:
+            print("🎯 TRADE MANAGEMENT MODE")
+            
+            # Enhanced trading analysis for trade management
+            if not self.run_enhanced_trading_analysis():
+                print("⚠️  Enhanced analysis failed, continuing with basic trade management...")
+            
+            # Update trailing stops
+            self.update_trailing_stops()
+            
+            return True
+            
+        elif self.timeframe == "m1":
+            print("⚡ RAPID MONITORING MODE")
+            
+            # Quick enhanced analysis
+            return self.run_enhanced_trading_analysis()
+        
+        else:
+            print(f"❌ Unsupported timeframe: {self.timeframe}")
+            return False
+    
+    def run_single_cycle(self) -> bool:
+        """Run a single trading cycle."""
+        if self.test_mode:
+            print(f"🔄 SIMULATION: {self.timeframe} timeframe reached")
+            time.sleep(1)
+        
+        return self.run_enhanced_trading_analysis()
+    
+    def run_continuous(self, max_cycles: int = None) -> None:
+        """Run continuous trading orchestration."""
+        cycle_count = 0
+        
+        if self.test_mode:
+            # In test mode, just run once or a few cycles
+            max_cycles = max_cycles or 1
+            print(f"🧪 Test mode: Running {max_cycles} cycle(s)")
+            
+            for i in range(max_cycles):
+                print(f"\n--- Test Cycle {i+1}/{max_cycles} ---")
+                self.run_single_cycle()
+                if i < max_cycles - 1:
+                    time.sleep(2)  # Short delay between test cycles
+            
+            print("🎯 Test cycles completed")
+            return
+        
+        # Real-time mode - single execution (called by timeframe scheduler)
+        self.run_single_cycle()
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description="Simple JGT Trading System Orchestrator",
+        epilog="Example: python simple_trading_orchestrator.py --timeframe m5 --instruments EUR-USD --demo --test-mode"
+    )
+    
+    parser.add_argument(
+        '--timeframe', '-t', 
+        default='H4',
+        help='Trading timeframe (m1, m5, m15, H1, H4, D1)'
+    )
+    
+    parser.add_argument(
+        '--instruments', '-i',
+        default='EUR-USD',
+        help='Comma-separated list of instruments (e.g., EUR-USD,GBP-USD)'
+    )
+    
+    parser.add_argument(
+        '--quality-threshold', '-q',
+        type=float,
+        default=8.0,
+        help='Quality threshold for trading signals (default: 8.0)'
+    )
+    
+    parser.add_argument(
+        '--demo',
+        action='store_true',
+        default=True,
+        help='Use demo account (default: True)'
+    )
+    
+    parser.add_argument(
+        '--real',
+        action='store_true',
+        help='Use real account (overrides --demo)'
+    )
+    
+    parser.add_argument(
+        '--test-mode',
+        action='store_true',
+        help='Run in test mode (simulation)'
+    )
+    
+    parser.add_argument(
+        '--max-cycles',
+        type=int,
+        help='Maximum cycles for test mode'
+    )
+    
+    args = parser.parse_args()
+    
+    # Parse instruments
+    instruments = [inst.strip() for inst in args.instruments.split(',')]
+    
+    # Determine demo/real mode
+    demo_mode = not args.real if args.real else args.demo
+    
+    # Create orchestrator
+    orchestrator = SimpleTradingOrchestrator(
+        timeframe=args.timeframe,
+        instruments=instruments,
+        quality_threshold=args.quality_threshold,
+        demo=demo_mode,
+        test_mode=args.test_mode
+    )
+    
+    # Run orchestrator
+    orchestrator.run_continuous(max_cycles=args.max_cycles)
+
+
+if __name__ == "__main__":
+    main() 

{jgtml-0.0.332 → jgtml-0.0.334}/jgtml/trading_orchestrator.py

@@ -356,4 +356,5 @@ def main():
 
 
 if __name__ == "__main__":
-    main() 
+    main() 
+  

{jgtml-0.0.332 → jgtml-0.0.334/jgtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jgtml
-Version: 0.0.332
+Version: 0.0.334
 Summary: JGT Ml - Machine Learning Tools
 Home-page: https://github.com/jgwill/jgtml
 Author: GUillaume Isabelle
@@ -17,7 +17,7 @@ License-File: LICENSE
 Requires-Dist: pandas>=0.25.1
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: python-dotenv>=0.19.2
-Requires-Dist: jgtpy>=0.5.113
+Requires-Dist: jgtpy>=0.5.116
 Requires-Dist: matplotlib>=3.3.1
 Requires-Dist: plotly>=5.18.0
 Requires-Dist: mplfinance>=0.12.10b0

{jgtml-0.0.332 → jgtml-0.0.334}/jgtml.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ jgtml/ptomlf.py
 jgtml/ptottf.py
 jgtml/ptottfpatterns.py
 jgtml/realityhelper.py
+jgtml/simple_trading_orchestrator.py
 jgtml/test_get_files_in_ns.py
 jgtml/test_pncli.py
 jgtml/test_signal_ordering_helper.py

{jgtml-0.0.332 → jgtml-0.0.334}/jgtml.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pandas>=0.25.1
 python-dateutil>=2.8.0
 python-dotenv>=0.19.2
-jgtpy>=0.5.113
+jgtpy>=0.5.116
 matplotlib>=3.3.1
 plotly>=5.18.0
 mplfinance>=0.12.10b0

{jgtml-0.0.332 → jgtml-0.0.334}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jgtml"
-version = "0.0.332"
+version = "0.0.334"
 authors = [
   { name="Guillaume Isabelle", email="jgi@jgwill.com" },
 ]
@@ -17,7 +17,7 @@ dependencies = [
   'pandas>=0.25.1',
   'python-dateutil>=2.8.0',
   'python-dotenv>=0.19.2',
-  'jgtpy>=0.5.113',
+  'jgtpy>=0.5.116',
   'matplotlib>=3.3.1',
   'plotly>=5.18.0',
   'mplfinance>=0.12.10b0',