PyPI - partitura - Versions diffs - 1.5.0__tar.gz → 1.6.0__tar.gz - Mend

partitura 1.5.0tar.gz → 1.6.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (108) hide show

{partitura-1.5.0 → partitura-1.6.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: partitura
-Version: 1.5.0
+Version: 1.6.0
 Summary: A package for handling symbolic musical information
 Home-page: https://github.com/CPJKU/partitura
 Author: Maarten Grachten, Carlos Cancino-Chacón, Silvan Peter, Emmanouil Karystinaios, Francesco Foscarin, Thassilo Gadermaier, Patricia Hu
@@ -21,6 +21,17 @@ Requires-Dist: lxml
 Requires-Dist: lark-parser
 Requires-Dist: xmlschema
 Requires-Dist: mido
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 [//]: # (<p align="center"> )

partitura-1.6.0/partitura/assets/score_example.mei ADDED Viewed

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0">
+   <meiHead xml:id="m21agkk">
+      <fileDesc xml:id="f1x9ud6p">
+         <titleStmt xml:id="t1pe4slb">
+            <title />
+            <respStmt />
+         </titleStmt>
+         <pubStmt xml:id="p1kxcrok">
+            <date isodate="2024-10-30" type="encoding-date">2024-10-30</date>
+         </pubStmt>
+      </fileDesc>
+      <encodingDesc xml:id="e1xr2zpp">
+         <appInfo xml:id="a1wyxc5n">
+            <application xml:id="a1t43ge2" isodate="2024-10-30T10:56:32" version="4.3.1-3b8cc17">
+               <name xml:id="n1cp60l4">Verovio</name>
+               <p xml:id="p13nndma">Transcoded from MusicXML</p>
+            </application>
+         </appInfo>
+      </encodingDesc>
+   </meiHead>
+   <music>
+      <body>
+         <mdiv xml:id="muo97v6">
+            <score xml:id="suneqlv">
+               <scoreDef xml:id="sz00r05">
+                  <staffGrp xml:id="s1h35kps">
+                     <staffGrp xml:id="P1" bar.thru="true">
+                        <grpSym xml:id="g1eji31e" symbol="brace" />
+                        <label xml:id="l8lirjj">Piano</label>
+                        <instrDef xml:id="iggd40h" midi.channel="0" midi.instrnum="0" midi.volume="78.00%" />
+                        <staffDef xml:id="sbpks8p" n="1" lines="5" ppq="1">
+                           <clef xml:id="c1p7nrnw" shape="G" line="2" />
+                           <keySig xml:id="ki5anqv" sig="0" />
+                           <meterSig xml:id="m1vpw2w2" count="4" unit="4" />
+                        </staffDef>
+                        <staffDef xml:id="s1g416nz" n="2" lines="5" ppq="1">
+                           <clef xml:id="cezkswz" shape="G" line="2" />
+                           <keySig xml:id="kk41xfz" sig="0" />
+                           <meterSig xml:id="m7alo7s" count="4" unit="4" />
+                        </staffDef>
+                     </staffGrp>
+                  </staffGrp>
+               </scoreDef>
+               <section xml:id="suu4o7p">
+                  <measure xml:id="m1e358qx" n="1">
+                     <staff xml:id="s1ufvigy" n="1">
+                        <layer xml:id="l1r7cvga" n="1">
+                           <rest xml:id="ro1o7cb" dur.ppq="2" dur="2" />
+                           <chord xml:id="c1c1r6b7" dur.ppq="2" dur="2" stem.dir="down">
+                              <note xml:id="n6dpu2p" oct="5" pname="c" />
+                              <note xml:id="njfgcwp" oct="5" pname="e" />
+                           </chord>
+                        </layer>
+                     </staff>
+                     <staff xml:id="s710zw2" n="2">
+                        <layer xml:id="leffrs2" n="5">
+                           <note xml:id="n1txt37q" dur.ppq="4" dur="1" oct="4" pname="a" />
+                        </layer>
+                     </staff>
+                  </measure>
+               </section>
+            </score>
+         </mdiv>
+      </body>
+   </music>
+</mei>

{partitura-1.5.0 → partitura-1.6.0}/partitura/io/__init__.py RENAMED Viewed

@@ -5,7 +5,9 @@ This module contains methods for importing and exporting symbolic music formats.
 """
 from typing import Union
 import os
+import urllib.request
+from urllib.parse import urlparse
+import tempfile
 from .importmusicxml import load_musicxml
 from .importmidi import load_score_midi, load_performance_midi
 from .musescore import load_via_musescore
@@ -32,6 +34,14 @@ class NotSupportedFormatError(Exception):
     pass
+def is_url(input):
+    try:
+        result = urlparse(input)
+        return all([result.scheme, result.netloc])
+    except ValueError:
+        return False
 @deprecated_alias(score_fn="filename")
 @deprecated_parameter("ensure_list")
 def load_score(filename: PathLike, force_note_ids="keep") -> Score:
@@ -57,11 +67,29 @@ def load_score(filename: PathLike, force_note_ids="keep") -> Score:
     scr: :class:`partitura.score.Score`
         A score instance.
     """
+    if is_url(filename):
+        url = filename
+        # Send a GET request to the URL
+        with urllib.request.urlopen(url) as response:
+            data = response.read()
+        # Extract the file extension from the URL
+        extension = os.path.splitext(url)[-1]
+        # Create a temporary file
+        temp_file = tempfile.NamedTemporaryFile(suffix=extension, delete=True)
+        # Write the content to the temporary file
+        with open(temp_file.name, "wb") as f:
+            f.write(data)
+        filename = temp_file.name
+    else:
+        extension = os.path.splitext(filename)[-1].lower()
-    extension = os.path.splitext(filename)[-1].lower()
     if extension in (".mxl", ".xml", ".musicxml"):
         # Load MusicXML
-        return load_musicxml(
+        score = load_musicxml(
             filename=filename,
             force_note_ids=force_note_ids,
         )
@@ -71,15 +99,15 @@ def load_score(filename: PathLike, force_note_ids="keep") -> Score:
             assign_note_ids = False
         else:
             assign_note_ids = True
-        return load_score_midi(
+        score = load_score_midi(
             filename=filename,
             assign_note_ids=assign_note_ids,
         )
     elif extension in [".mei"]:
         # Load MEI
-        return load_mei(filename=filename)
+        score = load_mei(filename=filename)
     elif extension in [".kern", ".krn"]:
-        return load_kern(
+        score = load_kern(
             filename=filename,
             force_note_ids=force_note_ids,
         )
@@ -107,7 +135,7 @@ def load_score(filename: PathLike, force_note_ids="keep") -> Score:
         ".gp",
     ]:
         # Load MuseScore
-        return load_via_musescore(
+        score = load_via_musescore(
             filename=filename,
             force_note_ids=force_note_ids,
         )
@@ -117,11 +145,11 @@ def load_score(filename: PathLike, force_note_ids="keep") -> Score:
             filename=filename,
             create_score=True,
         )
-        return score
     else:
         raise NotSupportedFormatError(
             f"{extension} file extension is not supported. If this should be supported, consider editing partitura/io/__init__.py file"
         )
+    return score
 def load_score_as_part(filename: PathLike) -> Part:

{partitura-1.5.0 → partitura-1.6.0}/partitura/io/exportkern.py RENAMED Viewed

@@ -327,7 +327,7 @@ def save_kern(
     out_data = exporter.parse()
     out_data = exporter.trim(out_data)
     # Use numpy savetxt to save the file
-    footer = "Encoded using the Partitura Python package, version 1.5.0"
+    footer = "Encoded using the Partitura Python package, version 1.6.0"
     if out is not None:
         np.savetxt(
             fname=out,

{partitura-1.5.0 → partitura-1.6.0}/partitura/io/exportmatch.py RENAMED Viewed

@@ -21,7 +21,6 @@ from partitura.performance import Performance, PerformedPart, PerformanceLike
 from partitura.io.matchlines_v1 import (
     make_info,
     make_scoreprop,
-    make_section,
     MatchSnote,
     MatchNote,
     MatchSnoteNote,
@@ -313,6 +312,7 @@ def matchfile_from_alignment(
             staff = getattr(snote, "staff", None)
             ornaments = getattr(snote, "ornaments", None)
             fermata = getattr(snote, "fermata", None)
+            technical = getattr(snote, "technical", None)
             if voice is not None:
                 score_attributes_list.append(f"v{voice}")
@@ -329,6 +329,11 @@ def matchfile_from_alignment(
             if fermata is not None:
                 score_attributes_list.append("fermata")
+            if technical is not None:
+                for tech_el in technical:
+                    if isinstance(tech_el, score.Fingering):
+                        score_attributes_list.append(f"fingering{tech_el.fingering}")
             if isinstance(snote, score.GraceNote):
                 score_attributes_list.append("grace")
@@ -417,7 +422,7 @@ def matchfile_from_alignment(
         duplicates[tuple(v)] = idx
     voice_overlap_note_ids = []
     if len(duplicates) > 0:
-        duplicate_idx = np.concatenate(np.array(list(duplicates.values()))).flatten()
+        duplicate_idx = np.hstack(list(duplicates.values()))
         voice_overlap_note_ids = list(sna[duplicate_idx]["id"])
     for al_note in alignment:

{partitura-1.5.0 → partitura-1.6.0}/partitura/io/exportmei.py RENAMED Viewed

@@ -6,6 +6,7 @@ This module contains methods for exporting MEI files.
 import math
 from collections import defaultdict
 from lxml import etree
+import lxml
 import partitura.score as spt
 from operator import itemgetter
 from itertools import groupby
@@ -225,6 +226,7 @@ class MEIExporter:
         self._handle_harmony(measure_el, start=measure.start.t, end=measure.end.t)
         self._handle_fermata(measure_el, start=measure.start.t, end=measure.end.t)
         self._handle_barline(measure_el, start=measure.start.t, end=measure.end.t)
+        self._handle_fingering(measure_el, start=measure.start.t, end=measure.end.t)
         return measure_el
     def _handle_chord(self, chord, xml_voice_el):
@@ -277,6 +279,9 @@ class MEIExporter:
         elif note.tie_prev is not None:
             note_el.set("tie", "t")
+        if note.stem_direction in ["up", "down"]:
+            note_el.set("stem.dir", note.stem_direction)
         if note.alter is not None:
             if (
                 note.step.lower() + ALTER_TO_MEI[note.alter]
@@ -292,7 +297,7 @@ class MEIExporter:
             note_el.set("grace", "acc")
         return duration
-    def _handle_tuplets(self, measure_el, start, end):
+    def _handle_tuplets(self, measure_el: lxml.etree._Element, start: int, end: int):
         for tuplet in self.part.iter_all(spt.Tuplet, start=start, end=end):
             start_note = tuplet.start_note
             end_note = tuplet.end_note
@@ -349,7 +354,7 @@ class MEIExporter:
             for el in xml_el_within_tuplet:
                 tuplet_el.append(el)
-    def _handle_beams(self, measure_el, start, end):
+    def _handle_beams(self, measure_el: lxml.etree._Element, start: int, end: int):
         for beam in self.part.iter_all(spt.Beam, start=start, end=end):
             # If the beam has only one note, skip it
             if len(beam.notes) < 2:
@@ -397,7 +402,9 @@ class MEIExporter:
                         if note_el.getparent() != beam_el:
                             beam_el.append(note_el)
-    def _handle_clef_changes(self, measure_el, start, end):
+    def _handle_clef_changes(
+        self, measure_el: lxml.etree._Element, start: int, end: int
+    ):
         for clef in self.part.iter_all(spt.Clef, start=start, end=end):
             # Clef element is parent of the note element
             if clef.start.t == 0:
@@ -418,7 +425,7 @@ class MEIExporter:
                     clef_el.set("shape", str(clef.sign))
                     clef_el.set("line", str(clef.line))
-    def _handle_ks_changes(self, measure_el, start, end):
+    def _handle_ks_changes(self, measure_el: lxml.etree._Element, start: int, end: int):
         # For key signature changes, we add a new scoreDef element at the beginning of the measure
         # and add the key signature element as attributes of the scoreDef element
         for key_sig in self.part.iter_all(spt.KeySignature, start=start, end=end):
@@ -448,7 +455,7 @@ class MEIExporter:
             parent = measure_el.getparent()
             parent.insert(parent.index(measure_el), score_def_el)
-    def _handle_ts_changes(self, measure_el, start, end):
+    def _handle_ts_changes(self, measure_el: lxml.etree._Element, start: int, end: int):
         # For key signature changes, we add a new scoreDef element at the beginning of the measure
         # and add the key signature element as attributes of the scoreDef element
         for time_sig in self.part.iter_all(spt.TimeSignature, start=start, end=end):
@@ -464,7 +471,7 @@ class MEIExporter:
             score_def_el.set("count", str(time_sig.beats))
             score_def_el.set("unit", str(time_sig.beat_type))
-    def _handle_harmony(self, measure_el, start, end):
+    def _handle_harmony(self, measure_el: lxml.etree._Element, start: int, end: int):
         """
         For harmonies we add a new harm element at the beginning of the measure.
         The position doesn't really matter since the tstamp attribute will place it correctly
@@ -505,7 +512,7 @@ class MEIExporter:
                 # text is a child element of harmony but not a xml element
                 harm_el.text = "|" + harmony.text
-    def _handle_fermata(self, measure_el, start, end):
+    def _handle_fermata(self, measure_el: lxml.etree._Element, start: int, end: int):
         for fermata in self.part.iter_all(spt.Fermata, start=start, end=end):
             if fermata.ref is not None:
                 note = fermata.ref
@@ -524,7 +531,7 @@ class MEIExporter:
                 # Set the fermata to be above the staff (the highest staff)
                 fermata_el.set("staff", "1")
-    def _handle_barline(self, measure_el, start, end):
+    def _handle_barline(self, measure_el: lxml.etree._Element, start: int, end: int):
         for end_barline in self.part.iter_all(
             spt.Ending, start=end, end=end + 1, mode="ending"
         ):
@@ -543,6 +550,26 @@ class MEIExporter:
         ):
             measure_el.set("left", "rptstart")
+    def _handle_fingering(self, measure_el: lxml.etree._Element, start: int, end: int):
+        """
+        For fingering we add a new fing element at the end of the measure.
+        The position doesn't really matter since the startid attribute will place it correctly
+        """
+        for note in self.part.iter_all(spt.Note, start=start, end=end):
+            if note.technical is not None:
+                for technical_notation in note.technical:
+                    if (
+                        isinstance(technical_notation, score.Fingering)
+                        and note.id is not None
+                    ):
+                        fing_el = etree.SubElement(measure_el, "fing")
+                        fing_el.set(XMLNS_ID, "fing-" + self.elc_id())
+                        fing_el.set("startid", note.id)
+                        # Naive way to place the fingering notation
+                        fing_el.set("place", ("above" if note.staff == 1 else "below"))
+                        # text is a child element of fingering but not a xml element
+                        fing_el.text = technical_notation.fingering
 @deprecated_alias(parts="score_data")
 def save_mei(

{partitura-1.5.0 → partitura-1.6.0}/partitura/io/exportmusicxml.py RENAMED Viewed

@@ -137,6 +137,10 @@ def make_note_el(note, dur, voice, counter, n_of_staves):
     if voice not in (None, 0):
         etree.SubElement(note_e, "voice").text = "{}".format(voice)
+    if note.stem_direction is not None:
+        stem_e = etree.SubElement(note_e, "stem")
+        stem_e.text = note.stem_direction
     if note.fermata is not None:
         notations.append(etree.Element("fermata"))
@@ -150,6 +154,19 @@ def make_note_el(note, dur, voice, counter, n_of_staves):
             articulations_e.extend(articulations)
             notations.append(articulations_e)
+    if note.technical:
+        technical = []
+        for technical_notation in note.technical:
+            if isinstance(technical_notation, score.Fingering):
+                tech_el = etree.Element("fingering")
+                tech_el.text = str(technical_notation.fingering)
+                technical.append(tech_el)
+        if technical:
+            technical_e = etree.Element("technical")
+            technical_e.extend(technical)
+            notations.append(technical_e)
     sym_dur = note.symbolic_duration or {}
     if sym_dur.get("type") is not None:
@@ -210,9 +227,26 @@ def make_note_el(note, dur, voice, counter, n_of_staves):
         else:
             del counter[tuplet_key]
-        notations.append(
-            etree.Element("tuplet", number="{}".format(number), type="start")
-        )
+        tuplet_e = etree.Element("tuplet", number="{}".format(number), type="start")
+        if (
+            tuplet.actual_notes is not None
+            and tuplet.normal_notes is not None
+            and tuplet.actual_type is not None
+            and tuplet.normal_type is not None
+        ):
+            # tuplet-actual tag
+            tuplet_actual_e = etree.SubElement(tuplet_e, "tuplet-actual")
+            tuplet_actual_notes_e = etree.SubElement(tuplet_actual_e, "tuplet-number")
+            tuplet_actual_notes_e.text = str(tuplet.actual_notes)
+            tuplet_actual_type_e = etree.SubElement(tuplet_actual_e, "tuplet-type")
+            tuplet_actual_type_e.text = str(tuplet.actual_type)
+            # tuplet-normal tag
+            tuplet_normal_e = etree.SubElement(tuplet_e, "tuplet-normal")
+            tuplet_normal_notes_e = etree.SubElement(tuplet_normal_e, "tuplet-number")
+            tuplet_normal_notes_e.text = str(tuplet.normal_notes)
+            tuplet_normal_type_e = etree.SubElement(tuplet_normal_e, "tuplet-type")
+            tuplet_normal_type_e.text = str(tuplet.normal_type)
+        notations.append(tuplet_e)
     if notations:
         notations_e = etree.SubElement(note_e, "notations")
@@ -413,9 +447,12 @@ def linearize_segment_contents(part, start, end, state):
     for voice in sorted(notes_by_voice.keys()):
         voice_notes = notes_by_voice[voice]
-        # sort by pitch
+        # sort by pitch (then step in case of enharmonic notes)
         voice_notes.sort(
-            key=lambda n: n.midi_pitch if hasattr(n, "midi_pitch") else -1, reverse=True
+            key=lambda n: (
+                (n.midi_pitch, n.step) if hasattr(n, "midi_pitch") else (-1, "")
+            ),
+            reverse=True,
         )
         # grace notes should precede other notes at the same onset
         voice_notes.sort(key=lambda n: not isinstance(n, score.GraceNote))
@@ -634,12 +671,20 @@ def merge_measure_contents(notes, other, measure_start):
         merged[0] = []
         cost[0] = 0
+    # CHANGE: disabled cost-based merging of non-note elements into stream
+    # because this led to attributes not being in the beginning of the measure,
+    # which in turn led to problems with musescore
+    # fix: add atributes first, then the notes.
+    # problem: unclear whether this cost-based merging will break anything or
+    # was just cosmetic to avoid too many forwards and backwards.
+    # related issue: https://github.com/CPJKU/partitura/issues/390
     # get the voice for which merging notes and other has lowest cost
-    merge_voice = sorted(cost.items(), key=itemgetter(1))[0][0]
+    # merge_voice = sorted(cost.items(), key=itemgetter(1))[0][0]
     result = []
     pos = measure_start
     for i, voice in enumerate(sorted(notes.keys())):
-        if voice == merge_voice:
+        if i == 0:  # voice == merge_voice:
             elements = merged[voice]
         else:
@@ -658,7 +703,7 @@ def merge_measure_contents(notes, other, measure_start):
             elif gap > 0:
                 e = etree.Element("forward")
                 ee = etree.SubElement(e, "duration")
-                ee.text = "{:d}".format(gap)
+                ee.text = "{:d}".format(int(gap))
                 result.append(e)
         result.extend([e for _, _, e in elements])
@@ -1053,8 +1098,8 @@ def save_musicxml(
             part_e.append(etree.Comment(MEASURE_SEP_COMMENT))
             attrib = {}
-            if measure.number is not None:
-                attrib["number"] = str(measure.number)
+            if measure.name is not None:
+                attrib["number"] = str(measure.name)
             measure_e = etree.SubElement(part_e, "measure", **attrib)
             contents = linearize_measure_contents(

partitura 1.5.0__tar.gz → 1.6.0__tar.gz

partitura 1.5.0tar.gz → 1.6.0tar.gz