0.11

--url and fastapi backend

Author: lukafilipxvic

.gitignore

@@ -8,6 +8,7 @@ __pycache__/
 csv_dup.py
 proxy.py
 *.opus
+.pypirc
 
 # C extensions
 *.so

README.md

@@ -44,6 +44,9 @@ pyzam --microphone
 
 # Listen to audio files
 pyzam --input audio_file.mp3
+
+# Listen to audio via URL
+pyzam --url "https://archive.org/download/09-hold-me-in-your-arms/02%20-%20Never%20Gonna%20Give%20You%20Up.mp3"
 ```
 
 ```bash
@@ -62,6 +65,7 @@ See `pyzam --help` for more options.
 | --input           | Detects from the given audio input file.
 | --microphone, -m  | Listens to the microphone of your device.
 | --speaker, -s     | Listens to the speaker of your device (default).
+| --url, -u         | Detects from the given URL to an audio file.
 | --help, -h        | Show usage & options and exit.
 | --duration, -d    | Length of microphone or speaker recording. Max = 12 seconds.
 | --loop, -l        | Loop the recognition process indefinitely.

fastapi/main.py

@@ -0,0 +1,18 @@
+from fastapi import FastAPI, HTTPException
+import subprocess
+
+app = FastAPI()
+
+@app.get("/identify/")
+async def identify_song(url: str):
+    command = [
+        "pyzam",
+        "--url", str(url),
+        "--json"  # Use JSON mode
+    ]
+
+    try:
+        result = subprocess.run(command, capture_output=True, text=True, check=True)
+        return "\n".join(result.stdout.splitlines()[1:])  # Return everything after the first line
+    except subprocess.CalledProcessError as e:
+        raise HTTPException(status_code=500, detail=f"Error: {e.stderr}")

pyzam/__init__.py

@@ -1 +1 @@
-__version__ = "0.1"
+__version__ = "0.11"

pyzam/__main__.py

@@ -1,8 +1,8 @@
 #! /usr/bin/env python3
 
 """
-Pyzam 0.10
-A CLI music recognition tool for audio and mixtapes using Python.
+Pyzam 0.11
+A CLI music recognition tool for audio and mixtapes.
 """
 
 import argparse
@@ -15,8 +15,6 @@
 import sys
 import tempfile
 
-import logging
-
 
 def _parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
@@ -40,6 +38,11 @@ def _parser() -> argparse.ArgumentParser:
         action="store_true",
         help="record audio from speaker (default)",
     )
+    input_group.add_argument(
+        "-u",
+        "--url",
+        help="Detect from an audio URL",
+    )
 
     parser.add_argument(
         "-d", "--duration", type=int, default=5, help="audio recording duration (s)"
@@ -78,6 +81,10 @@ def get_input_file(args, temp_dir) -> Path:
         return record.speaker(
             filename=f"{temp_dir}/pyzam_speaker.wav", seconds=args.duration
         )
+    elif args.url:
+        return record.url(url=args.url,
+            filename=f"{temp_dir}/pyzam_url.wav"
+        )
     else:
         return args.input
 
@@ -104,12 +111,15 @@ def main() -> None:
     parser = _parser()
     args = parser.parse_args()
 
-    # Check if  --input and --loop are used together
+    # Check if  --input or --url and --loop are used together
     if args.input and args.loop:
         parser.error("--loop is only allowed with --microphone or --speaker")
+    if args.url and args.loop:
+        parser.error("--loop is only allowed with --microphone or --speaker")
+
     # Check if --mixtape and (--microphone or --speaker) are used together
     if args.mixtape and (args.microphone or args.speaker):
-        parser.error("--mixtape is only allowed with --input")
+        parser.error("--mixtape is only allowed with --input or --url")
 
     temp_dir = tempfile.gettempdir()
 

pyzam/identify.py

@@ -77,7 +77,7 @@ async def identify_audio(
 
     if json:
         print(out)
-        return
+        return out
 
     track_info = extract_track_info(out)
     print_track_info(track_info)

pyzam/record.py

@@ -1,12 +1,14 @@
+import requests
 import soundcard as sc
 import soundfile as sf
+import io
 
 
 def speaker(filename: str, seconds):
     """
     Records the device's speaker.
 
-    :param filename: Name of audio file written.
+    :param filename: Name and directory of the audio file written.
     :param seconds: Duration to record (seconds).
     """
     with sc.get_microphone(
@@ -23,7 +25,7 @@ def microphone(filename: str, seconds):
     """
     Records the device's device.
 
-    :param filename: Name of audio file written.
+    :param filename: Name and directory of the audio file written.
     :param seconds: Duration to record (seconds).
     """
     with sc.get_microphone(
@@ -33,3 +35,31 @@ def microphone(filename: str, seconds):
         data = mic.record(numframes=44100 * seconds)
         sf.write(file=filename, data=data, samplerate=44100)
     return filename
+
+
+def url(url: str, filename: str):
+    """
+    Downloads audio from the provided URL.
+
+    :param url: URL of the audio file.
+    :param filename: Name and directory of the audio file written.
+    :param seconds: Duration to record (seconds).
+    """
+    print(f"Downloading audio from URL...")
+    headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246'}
+
+    try:
+        response = requests.get(url, headers=headers)
+        response.raise_for_status()  # Raises an HTTPError if code is 4XX/5XX
+
+    except requests.exceptions.HTTPError as http_err:
+        print(f'HTTP error occurred: {http_err}')
+        return None
+    except Exception as err:
+        print(f'An error occurred: {err}')
+        return None
+
+    # Ensure the response content is in a suitable format for soundfile
+    data, samplerate = sf.read(io.BytesIO(response.content))
+    sf.write(file=filename, data=data, samplerate=samplerate)
+    return filename

requirements.txt

@@ -1,6 +1,6 @@
 asyncio==3.4.3
-rich==13.7.1
+fastapi==0.111.0
+rich==13.8
 soundfile==0.12.1
-shazamio==0.5.1
-SoundCard==0.4.3
-#tk for live-recog-dev folder
+shazamio==0.6
+SoundCard==0.4.3

setup.py

@@ -5,10 +5,10 @@
 
 setuptools.setup(
     name="pyzam",
-    version="0.10",
+    version="0.11",
     entry_points={"console_scripts": ["pyzam = pyzam.__main__:main"]},
     author="lukafilipxvic",
-    description="A CLI music recognition tool for audio and mixtapes using Python.",
+    description="A CLI music recognition tool for audio and mixtapes.",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/lukafilipxvic/Pyzam",
@@ -21,4 +21,9 @@
     ],
     packages=setuptools.find_packages(),
     python_requires=">=3.9",
+    license="MIT",
+    classifiers=[
+        "Programming Language :: Python :: 3", 
+        "License :: OSI Approved :: MIT License",
+    ]
 )