Update utils/encryption_utils.py

utils/encryption_utils.py

@@ -14,10 +14,20 @@ import sys
 import argparse
 from typing import Optional
 from cryptography.fernet import Fernet, InvalidToken
-from .logger import log_error, log_warning
 
-_ENV_KEY = "FLARE_TOKEN_KEY"
+try:
+    from .logger import log_error, log_warning
+except ImportError:
+    # Fallback to simple print
+    def log_error(msg, error=None):
+        print(f"ERROR: {msg}", file=sys.stderr)
+        if error:
+            print(f"Details: {error}", file=sys.stderr)
+    
+    def log_warning(msg):
+        print(f"WARNING: {msg}", file=sys.stderr)
 
+_ENV_KEY = "FLARE_TOKEN_KEY"
 
 def _get_key() -> Fernet:
     """Get encryption key with better error messages"""
@@ -53,7 +63,6 @@ def _get_key() -> Fernet:
         log_error(error_msg, error=str(e))
         raise RuntimeError(error_msg)
 
-
 def encrypt(plain: str, key: Optional[str] = None) -> str:
     """düz string → enc:..."""
     if not plain:
@@ -72,7 +81,6 @@ def encrypt(plain: str, key: Optional[str] = None) -> str:
         log_error("Encryption failed", error=str(e))
         raise
 
-
 def decrypt(value: Optional[str], key: Optional[str] = None) -> Optional[str]:
     """enc:... ise çözer, değilse aynen döndürür"""
     if value is None or not isinstance(value, str):
@@ -104,6 +112,9 @@ def decrypt(value: Optional[str], key: Optional[str] = None) -> Optional[str]:
         log_error("Decryption error", error=str(e))
         raise
 
+def generate_key() -> str:
+    """Generate a new Fernet encryption key"""
+    return Fernet.generate_key().decode()
 
 def main():
     """CLI entry point"""
@@ -112,6 +123,13 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
 Examples:
+  # Generate a new key
+  python encryption_utils.py keygen
+  
+  # Save generated key to .env file
+  python encryption_utils.py keygen >> .env
+  # Then edit .env to add: FLARE_TOKEN_KEY=<generated-key>
+  
   # Encrypt with environment key
   python encryption_utils.py enc "secret message"
   
@@ -121,20 +139,21 @@ Examples:
   # Decrypt
   python encryption_utils.py dec "enc:gAAAAABh..."
   
-  # Generate new key
-  python -c "from cryptography.fernet import Fernet; print(Fernet.generate_key().decode())"
+  # Decrypt with custom key
+  python encryption_utils.py dec "enc:gAAAAABh..." --key "your-32-byte-base64-key"
         """
     )
     
     parser.add_argument(
         "command",
-        choices=["enc", "dec"],
-        help="Command to execute: 'enc' for encrypt, 'dec' for decrypt"
+        choices=["enc", "dec", "keygen"],
+        help="Command to execute: 'enc' for encrypt, 'dec' for decrypt, 'keygen' to generate new key"
     )
     
     parser.add_argument(
         "text",
-        help="Text to encrypt or decrypt"
+        nargs="?",
+        help="Text to encrypt or decrypt (not needed for keygen)"
     )
     
     parser.add_argument(
@@ -145,10 +164,17 @@ Examples:
     args = parser.parse_args()
     
     try:
-        if args.command == "enc":
+        if args.command == "keygen":
+            key = generate_key()
+            print(key)
+        elif args.command == "enc":
+            if not args.text:
+                parser.error("Text is required for encryption")
             result = encrypt(args.text, args.key)
             print(result)
         else:  # dec
+            if not args.text:
+                parser.error("Text is required for decryption")
             result = decrypt(args.text, args.key)
             print(result)
     except Exception as e: