austin-python 2.1.0__tar.gz → 2.1.1__tar.gz

{austin_python-2.1.0 → austin_python-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: austin-python
-Version: 2.1.0
+Version: 2.1.1
 Summary: Python wrapper for Austin, the CPython frame stack sampler.
 Project-URL: homepage, https://github.com/P403n1x87/austin-python
 Project-URL: documentation, https://austin-python.readthedocs.io

{austin_python-2.1.0 → austin_python-2.1.1}/austin/format/collapsed_stack.py

@@ -48,7 +48,7 @@ def parse_frame(frame: str) -> AustinFrame:
         filename, function, line = frame.rsplit(":", maxsplit=2)
     except ValueError:
         raise InvalidFrame(frame) from None
-    return AustinFrame(filename=filename, function=function, line=int(line))
+    return AustinFrame(filename=filename, function=function, line=int(line or 0))
 
 
 def parse_collapsed_stack(sample: str) -> AustinSample:

{austin_python-2.1.0 → austin_python-2.1.1}/austin/format/pprof/__main__.py

@@ -22,6 +22,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from argparse import ArgumentParser
+from pathlib import Path
 
 from austin.events import AustinMetadata
 from austin.events import AustinSample
@@ -41,19 +42,21 @@ def main() -> None:
 
     arg_parser.add_argument(
         "input",
-        type=str,
+        type=Path,
         help="The input file containing Austin samples.",
     )
     arg_parser.add_argument(
-        "output", type=str, help="The name of the output pprof file."
+        "output",
+        type=Path,
+        help="The name of the output pprof file.",
     )
 
-    arg_parser.add_argument("-V", "--version", action="version", version="0.2.0")
+    arg_parser.add_argument("-V", "--version", action="version", version="0.2.1")
 
     args = arg_parser.parse_args()
 
     try:
-        with AustinFileReader(args.input) as fin:
+        with args.input.open() as austin, AustinFileReader(austin) as fin:
             pprof = None
             for e in fin:
                 if isinstance(e, AustinMetadata) and e.name == "mode":

{austin_python-2.1.0 → austin_python-2.1.1}/austin/format/speedscope.py

@@ -26,6 +26,7 @@ from dataclasses import asdict
 from dataclasses import dataclass
 from dataclasses import field
 from enum import Enum
+from pathlib import Path
 from typing import Dict
 from typing import List
 from typing import Optional
@@ -33,13 +34,14 @@ from typing import TextIO
 from typing import Union
 
 from austin.events import AustinFrame
+from austin.events import AustinMetadata
 from austin.events import AustinSample
 from austin.format import Mode
 from austin.format.collapsed_stack import AustinFileReader
 from austin.format.collapsed_stack import InvalidSample
 
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 SpeedscopeJson = Dict
 SpeedscopeWeight = int
@@ -208,11 +210,11 @@ def main() -> None:
 
     arg_parser.add_argument(
         "input",
-        type=str,
+        type=Path,
         help="The input file containing Austin samples in normal format.",
     )
     arg_parser.add_argument(
-        "output", type=str, help="The name of the output Speedscope JSON file."
+        "output", type=Path, help="The name of the output Speedscope JSON file."
     )
     arg_parser.add_argument(
         "--indent", type=int, help="Give a non-null value to prettify the JSON output."
@@ -223,24 +225,30 @@ def main() -> None:
     args = arg_parser.parse_args()
 
     try:
-        with AustinFileReader(args.input) as fin:
-            mode = fin.metadata["mode"]
-            speedscope = Speedscope(os.path.basename(args.input), mode, args.indent)
+        with args.input.open() as austin, AustinFileReader(austin) as fin:
+            speedscope = None
             for event in fin:
-                if not isinstance(event, AustinSample):
-                    continue
-                try:
-                    speedscope.add_sample(event)
-                except InvalidSample:
-                    continue
+                if isinstance(event, AustinMetadata):
+                    if event.name == "mode":
+                        speedscope = Speedscope(
+                            os.path.basename(args.input), event.value, args.indent
+                        )
+                elif isinstance(event, AustinSample):
+                    if speedscope is not None:
+                        speedscope.add_sample(event)
+                else:
+                    raise ValueError("Invalid sample found in input file")
+
+        if speedscope is None:
+            raise RuntimeError("Invalid input file: no mode metadata found")
+
+        with args.output.open("w") as fout:
+            speedscope.dump(fout)
 
     except FileNotFoundError:
         print(f"No such input file: {args.input}")
         exit(1)
 
-    with open(args.output, "w") as fout:
-        speedscope.dump(fout)
-
 
 if __name__ == "__main__":
     main()

{austin_python-2.1.0 → austin_python-2.1.1}/test/data/austin.json

@@ -513,5 +513,5 @@
     }
   ],
   "name": "austin.out",
-  "exporter": "Austin2Speedscope Converter 0.3.0"
+  "exporter": "Austin2Speedscope Converter 0.3.1"
 }