Compare commits

..

68 Commits

Author SHA1 Message Date
inpos 6a6ab1beb2 python3 last change 2017-03-01 21:54:38 +03:00
inpos f45bc1f1c5 python3 agi get_result 2017-03-01 21:43:02 +03:00
inpos 386574d8ac python3 agi send_command 2017-03-01 20:56:06 +03:00
inpos d81fa0ea5f python3 agi _quote 2017-03-01 20:49:12 +03:00
inpos 4f303e668e python3 agi stderr 2017-03-01 20:45:17 +03:00
Randall Degges d8795f8864 Merge pull request #32 from Revent/patch-1
Update Manager.py added EarlyMedia to originate
2017-01-13 14:06:32 -08:00
Ilya Gorskin d5149c99a9 Update Manager.py added EarlyMedia to originate 2017-01-13 19:10:24 +05:00
Randall Degges acba249299
Updating changelog. 2016-11-04 11:25:38 -07:00
Randall Degges 2c9de6490c Merge pull request #28 from VoIPCS/fix_unicode
Version bump and unicode fix in send_action
2016-11-04 11:22:50 -07:00
Randall Degges 5f37f3ee61 Merge pull request #29 from invitecomm/master
Updated 'RECORD FILE' syntax, included silence detection value
2016-09-11 21:46:46 -07:00
poing 1d2f461fba Focus on UTF8 2016-09-08 11:12:19 +09:00
poing 1e890057db Focus on UTF8 2016-09-08 11:11:11 +09:00
poing 2c3357200f Focus on UTF8 2016-09-08 11:08:21 +09:00
poing c71a17ce84 Focus on UTF8 2016-09-08 11:06:13 +09:00
poing 13e0369a33 Focus on UTF8 2016-09-08 11:03:15 +09:00
poing 97a3c986eb Focus on UTF8 2016-09-08 11:02:37 +09:00
poing e4325c9be5 Focus on UTF8 2016-09-08 11:01:57 +09:00
poing f143d5fd00 Focus on UTF8 2016-09-08 11:01:10 +09:00
poing dab19ede42 Focus on UTF8 2016-09-08 10:55:56 +09:00
poing 96fabab755 Focus on UTF8 2016-09-08 10:52:01 +09:00
poing 68db20dd65 Focus on UTF8 2016-09-08 10:51:01 +09:00
poing cae17c32bb Fixing unicode 2016-09-07 18:02:23 +09:00
poing 267f8444ec Fixing unicode 2016-09-07 18:01:28 +09:00
poing 59a3698a87 Fixing unicode 2016-09-07 17:59:50 +09:00
poing 2f9d2a35dc Fixing unicode 2016-09-07 17:59:05 +09:00
poing d7b47ccf6a Chaged encoding to utf8 2016-09-07 16:52:24 +09:00
poing 080bb6d627 Updated 'RECORD FILE' syntax, included silence detection value 2016-09-06 18:47:21 +09:00
DarkS 4c72047372 Version bump to 0.5.0.
Fix unicode in send_action to AMI.
2016-08-26 11:40:44 +02:00
Randall Degges aa47075e30 Merge pull request #22 from GaboFDC/master
Adding use of Sphinx documentation
2016-05-04 17:03:49 -07:00
Randall Degges 1eecd02370 Merge pull request #25 from VoIPCS/chanvars
Make that channel variables will be stored in a dictionary
2016-05-04 17:03:35 -07:00
Randall Degges 17e45b7a5c Merge pull request #24 from VoIPCS/fix_unicode
Added ignore in decode of received lines
2016-05-04 17:02:30 -07:00
DarkS a9adb6bf82 Added ignore in decode of received lines, if this fails kill the message_thread 2016-05-03 18:08:47 +02:00
DarkS 0f57960740 Make that channel variables will be stored in a dictionary 2016-05-03 18:06:59 +02:00
GaboFDC 468c208a81 Added ignore of doc build files (html) 2016-03-28 23:09:43 -05:00
GaboFDC 0002576edc Removed doc build files (html) and make.bat 2016-03-28 23:08:55 -05:00
Randall Degges 7cb9bba367 Merge pull request #23 from AlmogCohen/master
master
2016-03-22 09:22:24 -07:00
almog cohen 53c8d91752 added the EXEC command, which enables running all the possible asterisk commands 2016-03-22 15:08:48 +02:00
GaboFDC 00cb52915a Generated files by make 2016-03-08 10:36:00 -05:00
GaboFDC 5dc07b628b Initial Sphinx documentation, with quickstart and some minor changes 2016-03-08 10:34:28 -05:00
GaboFDC 26ac52644c Updated docstring to use rst format 2016-03-08 10:33:39 -05:00
Randall Degges a974c479d2 Version bump. 2016-02-16 13:39:16 -08:00
Randall Degges 40b935406a Updating the changelog. 2016-02-16 13:38:53 -08:00
Randall Degges 7e0dc533de Fixing bug in AGI class.
Fixes #21.
2016-02-16 13:37:36 -08:00
Randall Degges 2dab6612c8 Merge pull request #20 from tuxpowered/testing
Testing Branch for FastAGI support
2015-11-19 17:01:10 -08:00
Ben Davis 24e7cf1258 Corrected typo 2015-11-18 12:09:49 -08:00
Ben Davis 4c9045fbbf Updated README to include FastAGI documentation 2015-11-18 12:06:43 -08:00
Ben Davis 1a0b54bbc6 Modified agi.py to accept stdin/out/error to allow support for FastAGI access.
Included new fastagi.py to be used as basic FastAGI server.
2015-11-18 09:48:52 -08:00
Randall Degges d3ba843f00 Version bump. 2015-11-16 12:18:17 -08:00
Randall Degges 53fbffbeee Updating changelog. 2015-11-16 12:17:56 -08:00
Randall Degges d4b1f0b070 Merge pull request #18 from Scinawa/master
correct line indentation, previously reulting in syntax error
2015-11-16 12:17:10 -08:00
Scinawa 6623b7cf41 correct line indentation reulting in syntax error 2015-11-16 20:20:04 +01:00
TuxPowered 750662bea5 Merge pull request #2 from rdegges/master
Updating local git
2015-11-16 10:56:22 -08:00
Randall Degges 5a4d3d65b8 Removing executable bit from setup.py. 2015-11-14 23:09:33 -08:00
Randall Degges eceb87e84c Version bump. 2015-11-14 23:01:42 -08:00
Randall Degges 4a98d070c3 Adding Ben Davis to CHANGELOG / cutting release. 2015-11-14 23:01:14 -08:00
Randall Degges bd6ac43f86 Merge pull request #17 from tuxpowered/master
Corrected _quote() to allow utf-8 strings to be passed.
2015-11-14 22:57:26 -08:00
TuxPowered 6b2c4dac7b Convert Float to string
Corrected where float values passed to _quote need to be converted to string to support .encode()
2015-11-14 13:13:57 -08:00
TuxPowered 1481fb215f Updated string quoting
Converts passed integers and bool to string, used to prevent string.encode() from erroring.
2015-11-14 12:26:07 -08:00
TuxPowered cef87f4241 Force quoted string to ascii
If setting variables to non-ascii values (such as reading data from a database) your script will fail due to UnicodeEncodeError.
My forcing the encoding of the string at the 'quote' to ascii and ignoring non-ascii chars, we are able to prevent abnormal script exits due to quoted string chars.
2015-11-14 03:00:29 -08:00
TuxPowered debdd61443 Merge pull request #1 from rdegges/master
Update local fork
2015-10-27 10:49:19 -07:00
Randall Degges 61f1090593 Version bump. 2015-07-18 19:18:11 -07:00
Randall Degges 5657b88976 Updating changelog. 2015-07-18 19:17:56 -07:00
Randall Degges 56fddf1f00 Merge pull request #13 from dext0r/utf8
Support utf8 for commands.
2015-07-18 19:16:51 -07:00
Artem Sorokin 46a5ff8d97 Support utf8 for commands. 2015-07-16 15:14:54 +03:00
Randall Degges 875079842b Version bump. 2015-07-15 12:57:46 -07:00
Randall Degges dd0a54c42a Updating changelog. 2015-07-15 12:57:22 -07:00
Randall Degges 0d3b579259 Merge pull request #12 from dext0r/master
Fix multiline command end marker for OpenVox GSM Gateway
2015-07-15 12:56:01 -07:00
Artem Sorokin be41ef480d Fix multiline command end marker for OpenVox GSM Gateway 2015-07-15 15:47:39 +03:00
29 changed files with 792 additions and 56 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@
.coverage .coverage
# Build remnants. # Build remnants.
html
dist dist
build build
_build _build

View File

@ -1,3 +1,28 @@
2016-11-04 VoiPCS <https://github.com/VoIPCS>
* Fixing unicode bug in `send_action` for AMI.
2016-02-16 Randall Degges <https://github.com/rdegges>
* Fixing issue in AGI class init function. Thanks to @sancho2934489 for the
find!
2015-11-16 Scinawa Antani <https://github.com/Scinawa>
* Fixing indentation errors.
2015-11-14 Ben Davis <https://github.com/tuxpowered>
* Handling more UTF-8 encoding issues in `_quote` method.
2015-07-18 Artem Sorokin
* Fixing UTF-8 encoding issues.
2015-07-15 Artem Sorokin
* Fix multiline command end marker for OpenVox GSM Gateway.
2015-03-31 Randall Degges 2015-03-31 Randall Degges
* Porting packaging to setuptools (modern). * Porting packaging to setuptools (modern).

View File

@ -89,6 +89,17 @@ directly on the host where Asterisk is running. Since Asterisk doesn't
run on windows platforms (and probably never will) the agi part of the run on windows platforms (and probably never will) the agi part of the
package can only be run on Asterisk platforms. package can only be run on Asterisk platforms.
FastAGI
-------
FastAGI support is a python based raw SocketServer, To start the server
python fastagi.py should start it listening on localhost and the default
asterisk FastAGI port. This does require the newest version of pyst2.
The FastAGI server runs in as a Forked operation for each request, in
an attempt to prevent blocking by a single bad service. As a result the
FastAGI server may consume more memory then a single process. If you need
to use a single process simply uncomment the appropriate line. Future versions
of this will use a config file to set options.
Credits Credits
------- -------

View File

@ -11,4 +11,4 @@ manager - a module for interacting with the asterisk manager interface
""" """
__all__ = ['agi', 'agitb', 'config', 'manager'] __all__ = ['agi', 'agitb', 'config', 'manager']
__version__ = '0.4.4' __version__ = '0.5.0'

105
asterisk/agi.py 100644 → 100755
View File

@ -1,28 +1,33 @@
#!/usr/bin/env python2 #! /usr/bin/env python
# vim: set et sw=4: # -*- coding: utf-8 -*-
"""agi # vim: set et sw=4 fenc=utf-8:
"""
.. module:: agi
:synopsis: This module contains functions and classes to implment AGI scripts in python.
This module contains functions and classes to implment AGI scripts in python.
pyvr pyvr
{'agi_callerid' : 'mars.putland.int', {'agi_callerid' : 'mars.putland.int',
'agi_channel' : 'IAX[kputland@kputland]/119', 'agi_channel' : 'IAX[kputland@kputland]/119',
'agi_context' : 'default', 'agi_context' : 'default',
'agi_dnid' : '666', 'agi_dnid' : '1000',
'agi_enhanced' : '0.0', 'agi_enhanced' : '0.0',
'agi_extension': '666', 'agi_extension': '1000',
'agi_language' : 'en', 'agi_language' : 'en',
'agi_priority' : '1', 'agi_priority' : '1',
'agi_rdnis' : '', 'agi_rdnis' : '',
'agi_request' : 'pyst', 'agi_request' : 'pyst',
'agi_type' : 'IAX'} 'agi_type' : 'IAX'}
Specification
-------------
""" """
import sys import sys
import pprint import pprint
import re import re
import signal import signal
from six import PY3
DEFAULT_TIMEOUT = 2000 # 2sec timeout used as default for functions that take timeouts DEFAULT_TIMEOUT = 2000 # 2sec timeout used as default for functions that take timeouts
DEFAULT_RECORD = 20000 # 20sec record time DEFAULT_RECORD = 20000 # 20sec record time
@ -85,21 +90,26 @@ class AGI:
Asterisk. Asterisk.
""" """
def __init__(self): def __init__(self, stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr):
self.stdin = stdin
self.stdout = stdout
self.stderr = stderr
self._got_sighup = False self._got_sighup = False
signal.signal(signal.SIGHUP, self._handle_sighup) # handle SIGHUP signal.signal(signal.SIGHUP, self._handle_sighup) # handle SIGHUP
sys.stderr.write('ARGS: ') self.stderr.write('ARGS: ')
sys.stderr.write(str(sys.argv)) self.stderr.write(str(sys.argv))
sys.stderr.write('\n') self.stderr.write('\n')
self.env = {} self.env = {}
self._get_agi_env() self._get_agi_env()
def _get_agi_env(self): def _get_agi_env(self):
while 1: while 1:
line = sys.stdin.readline().strip() line = self.stdin.readline().strip()
sys.stderr.write('ENV LINE: ') if PY3:
sys.stderr.write(line) if type(line) is bytes: line = line.decode('utf8')
sys.stderr.write('\n') self.stderr.write('ENV LINE: ')
self.stderr.write(line)
self.stderr.write('\n')
if line == '': if line == '':
#blank line signals end #blank line signals end
break break
@ -108,12 +118,20 @@ class AGI:
data = data.strip() data = data.strip()
if key != '': if key != '':
self.env[key] = data self.env[key] = data
sys.stderr.write('class AGI: self.env = ') self.stderr.write('class AGI: self.env = ')
sys.stderr.write(pprint.pformat(self.env)) self.stderr.write(pprint.pformat(self.env))
sys.stderr.write('\n') self.stderr.write('\n')
def _quote(self, string): def _quote(self, string):
return ''.join(['"', str(string), '"']) """ provides double quotes to string, converts int/bool to string """
if isinstance(string, int):
string = str(string)
if isinstance(string, float):
string = str(string)
if PY3:
return ''.join(['"', string, '"'])
else:
return ''.join(['"', string.encode('utf8', 'ignore'), '"'])
def _handle_sighup(self, signum, frame): def _handle_sighup(self, signum, frame):
"""Handle the SIGHUP signal""" """Handle the SIGHUP signal"""
@ -144,16 +162,21 @@ class AGI:
command = command.strip() command = command.strip()
if command[-1] != '\n': if command[-1] != '\n':
command += '\n' command += '\n'
sys.stderr.write(' COMMAND: %s' % command) self.stderr.write(' COMMAND: %s' % command)
sys.stdout.write(command) if PY3:
sys.stdout.flush() self.stdout.write(command.encode('utf8'))
else:
self.stdout.write(command)
self.stdout.flush()
def get_result(self, stdin=sys.stdin): def get_result(self, stdin=sys.stdin):
"""Read the result of a command from Asterisk""" """Read the result of a command from Asterisk"""
code = 0 code = 0
result = {'result': ('', '')} result = {'result': ('', '')}
line = stdin.readline().strip() line = self.stdin.readline().strip()
sys.stderr.write(' RESULT_LINE: %s\n' % line) if PY3:
if type(line) is bytes: line = line.decode('utf8')
self.stderr.write(' RESULT_LINE: %s\n' % line)
m = re_code.search(line) m = re_code.search(line)
if m: if m:
code, response = m.groups() code, response = m.groups()
@ -170,16 +193,20 @@ class AGI:
if key == 'result' and value == '-1': if key == 'result' and value == '-1':
raise AGIAppError("Error executing application, or hangup") raise AGIAppError("Error executing application, or hangup")
sys.stderr.write(' RESULT_DICT: %s\n' % pprint.pformat(result)) self.stderr.write(' RESULT_DICT: %s\n' % pprint.pformat(result))
return result return result
elif code == 510: elif code == 510:
raise AGIInvalidCommand(response) raise AGIInvalidCommand(response)
elif code == 520: elif code == 520:
usage = [line] usage = [line]
line = stdin.readline().strip() line = self.stdin.readline().strip()
if PY3:
if type(line) is bytes: line = line.decode('utf8')
while line[:3] != '520': while line[:3] != '520':
usage.append(line) usage.append(line)
line = stdin.readline().strip() line = self.stdin.readline().strip()
if PY3:
if type(line) is bytes: line = line.decode('utf8')
usage.append(line) usage.append(line)
usage = '%s\n' % '\n'.join(usage) usage = '%s\n' % '\n'.join(usage)
raise AGIUsageError(usage) raise AGIUsageError(usage)
@ -482,17 +509,20 @@ class AGI:
self.set_extension(extension) self.set_extension(extension)
self.set_priority(priority) self.set_priority(priority)
def record_file(self, filename, format='gsm', escape_digits='#', timeout=DEFAULT_RECORD, offset=0, beep='beep'): def record_file(self, filename, format='gsm', escape_digits='#', timeout=DEFAULT_RECORD, offset=0, beep='beep', silence=0):
"""agi.record_file(filename, format, escape_digits, timeout=DEFAULT_TIMEOUT, offset=0, beep='beep') --> None """agi.record_file(filename, format, escape_digits, timeout=DEFAULT_TIMEOUT, offset=0, beep='beep', silence=0) --> None
Record to a file until a given dtmf digit in the sequence is received Record to a file until a given dtmf digit in the sequence is received. Returns
The format will specify what kind of file will be recorded. The timeout '-1' on hangup or error. The format will specify what kind of file will be
is the maximum record time in milliseconds, or -1 for no timeout. Offset recorded. The <timeout> is the maximum record time in milliseconds, or '-1'
samples is optional, and if provided will seek to the offset without for no <timeout>. <offset samples> is optional, and, if provided, will seek
exceeding the end of the file to the offset without exceeding the end of the file. <silence> is the number
of seconds of silence allowed before the function returns despite the lack
of dtmf digits or reaching <timeout>. <silence> value must be preceded by
's=' and is also optional.
""" """
escape_digits = self._process_digit_list(escape_digits) escape_digits = self._process_digit_list(escape_digits)
res = self.execute('RECORD FILE', self._quote(filename), format, res = self.execute('RECORD FILE', self._quote(filename), format,
escape_digits, timeout, offset, beep)['result'][0] escape_digits, timeout, offset, beep, ('s=%s' % silence))['result'][0]
try: try:
return chr(int(res)) return chr(int(res))
except: except:
@ -659,6 +689,13 @@ class AGI:
""" """
self.execute('NOOP') self.execute('NOOP')
def exec_command(self, command, *args):
"""Send an arbitrary asterisk command with args (even not AGI commands)"""
# The arguments of the command should be prepared as comma delimited, that's the way the EXEC works
args = ','.join(map(str, args))
return self.execute('EXEC', command, args)
if __name__ == '__main__': if __name__ == '__main__':
agi = AGI() agi = AGI()
#agi.appexec('festival','Welcome to Klass Technologies. Thank you for calling.') #agi.appexec('festival','Welcome to Klass Technologies. Thank you for calling.')

View File

@ -1,20 +1,27 @@
"""More comprehensive traceback formatting for Python scripts. """
.. module:: agitb
:synopsis: More comprehensive traceback formatting for Python scripts.
Example
-------
To enable this module, do: To enable this module, do:
import asterisk.agitb, asterisk.agi .. code-block:: python
asterisk.agitb.enable(display = False, logdir = '/var/log/asterisk/')
agi = asterisk.agi.AGI() import asterisk.agitb, asterisk.agi
asterisk.agitb.enable(agi, False, '/var/log/asterisk') asterisk.agitb.enable(display = False, logdir = '/var/log/asterisk/')
agi = asterisk.agi.AGI()
asterisk.agitb.enable(agi, False, '/var/log/asterisk')
at the top of your script. The optional arguments to enable() are: at the top of your script. The optional arguments to enable() are:
agi - the agi handle to write verbose messages to * agi - the agi handle to write verbose messages to
display - if true, tracebacks are displayed on the asterisk console * display - if true, tracebacks are displayed on the asterisk console
(used with the agi option) (used with the agi option)
logdir - if set, tracebacks are written to files in this directory * logdir - if set, tracebacks are written to files in this directory
context - number of lines of source code to show for each stack frame * context - number of lines of source code to show for each stack frame
By default, tracebacks are displayed but not saved, and the context is 5 lines. By default, tracebacks are displayed but not saved, and the context is 5 lines.
@ -27,6 +34,9 @@ for you, call agitb.handler(). The optional argument to handler() is a
If you do not pass anything to handler() it will use sys.exc_info(). If you do not pass anything to handler() it will use sys.exc_info().
This script was adapted from Ka-Ping Yee's cgitb. This script was adapted from Ka-Ping Yee's cgitb.
Specification
-------------
""" """
__author__ = 'Matthew Nicholson' __author__ = 'Matthew Nicholson'

View File

@ -1,10 +1,16 @@
#!/usr/bin/env python #!/usr/bin/env python
# vim: set expandtab: # vim: set expandtab:
""" """
Parse Asterisk configuration files. .. module:: config
:synopsis: Parse Asterisk configuration files.
This module provides parsing functionality for asterisk config files. This module provides parsing functionality for asterisk config files.
Example
----------
.. code-block:: python
import asterisk.config import asterisk.config
import sys import sys
@ -24,6 +30,10 @@ This module provides parsing functionality for asterisk config files.
for item in category.items: for item in category.items:
print ' %s = %s' % (item.name, item.value) print ' %s = %s' % (item.name, item.value)
Specification
-------------
""" """
import sys import sys

View File

@ -0,0 +1,48 @@
#!/usr/bin/env python
"""
.. module:: fastagi
:synopsis: FastAGI service for Asterisk
Requires modified pyst2 to support reading stdin/out/err
Copyright 2011 VOICE1, LLC
By: Ben Davis <ben@voice1-dot-me>
Specification
-------------
"""
import sys
import SocketServer
import asterisk.agi
# import pkg_resources
# PYST_VERSION = pkg_resources.get_distribution("pyst2").version
__verison__ = 0.1
#TODO: Read options from config file.
HOST, PORT = "127.0.0.1", 4573
class FastAGI(SocketServer.StreamRequestHandler):
# Close connections not finished in 5seconds.
timeout = 5
def handle(self):
try:
agi=asterisk.agi.AGI(stdin=self.rfile, stdout=self.wfile, stderr=sys.stderr)
agi.verbose("pyst2: FastAGI on: {}:{}".format(HOST, PORT))
except TypeError as e:
sys.stderr.write('Unable to connect to agi://{} {}\n'.format(self.client_address[0], str(e)))
except SocketServer.socket.timeout as e:
sys.stderr.write('Timeout receiving data from {}\n'.format(self.client_address))
except SocketServer.socket.error as e:
sys.stderr.write('Could not open the socket. Is someting else listening on this port?\n')
except Exception as e:
sys.stderr.write('An unknown error: {}\n'.format(str(e)))
if __name__ == "__main__":
# server = SocketServer.TCPServer((HOST, PORT), FastAGI)
server = SocketServer.ForkingTCPServer((HOST, PORT), FastAGI)
# Keep server running until CTRL-C is pressed.
server.serve_forever()

View File

@ -2,10 +2,16 @@
# vim: set expandtab shiftwidth=4: # vim: set expandtab shiftwidth=4:
""" """
Python Interface for Asterisk Manager .. module:: manager
:synopsis: Python Interface for Asterisk Manager
This module provides a Python API for interfacing with the asterisk manager. This module provides a Python API for interfacing with the asterisk manager.
Example
-------
.. code-block:: python
import asterisk.manager import asterisk.manager
import sys import sys
@ -50,6 +56,9 @@ Remember all header, response, and event names are case sensitive.
Not all manager actions are implmented as of yet, feel free to add them Not all manager actions are implmented as of yet, feel free to add them
and submit patches. and submit patches.
Specification
-------------
""" """
import sys import sys
@ -108,7 +117,15 @@ class ManagerMsg(object):
break break
try: try:
k, v = (x.strip() for x in line.split(':', 1)) k, v = (x.strip() for x in line.split(':', 1))
self.headers[k] = v # if header is ChanVariable it can have more that one value
# we store the variable in a dictionary parsed
if 'ChanVariable' in k:
if not self.headers.has_key('ChanVariable'):
self.headers['ChanVariable']={}
name, value = (x.strip() for x in v.split('=',1))
self.headers['ChanVariable'][name]=value
else:
self.headers[k] = v
except ValueError: except ValueError:
# invalid header, start of multi-line data response # invalid header, start of multi-line data response
data.extend(response[n:]) data.extend(response[n:])
@ -263,7 +280,7 @@ class Manager(object):
# lock the socket and send our command # lock the socket and send our command
try: try:
self._sock.write(command.encode('ascii')) self._sock.write(command.encode('utf8','ignore'))
self._sock.flush() self._sock.flush()
except socket.error as e: except socket.error as e:
raise ManagerSocketException(e.errno, e.strerror) raise ManagerSocketException(e.errno, e.strerror)
@ -291,7 +308,7 @@ class Manager(object):
try: try:
lines = [] lines = []
for line in self._sock: for line in self._sock:
line = line.decode('ascii') line = line.decode('utf8','ignore')
# check to see if this is the greeting line # check to see if this is the greeting line
if not self.title and '/' in line and not ':' in line: if not self.title and '/' in line and not ':' in line:
# store the title of the manager we are connecting to: # store the title of the manager we are connecting to:
@ -331,7 +348,7 @@ class Manager(object):
line.split(':', 1)[1].strip() == 'Follows': line.split(':', 1)[1].strip() == 'Follows':
wait_for_marker = True wait_for_marker = True
# same when seeing end of multiline response # same when seeing end of multiline response
if multiline and line.startswith('--END COMMAND--'): if multiline and (line.startswith('--END COMMAND--') or line.strip().endswith('--END COMMAND--')):
wait_for_marker = False wait_for_marker = False
multiline = False multiline = False
# same when seeing end of status response # same when seeing end of status response
@ -558,7 +575,7 @@ class Manager(object):
return response return response
def originate(self, channel, exten, context='', priority='', timeout='', caller_id='', async=False, account='', variables={}): def originate(self, channel, exten, context='', priority='', timeout='', caller_id='', async=False, earlymedia='false', account='', variables={}):
"""Originate a call""" """Originate a call"""
cdict = {'Action': 'Originate'} cdict = {'Action': 'Originate'}
@ -574,6 +591,8 @@ class Manager(object):
cdict['CallerID'] = caller_id cdict['CallerID'] = caller_id
if async: if async:
cdict['Async'] = 'yes' cdict['Async'] = 'yes'
if earlymedia:
cdict['EarlyMedia'] = earlymedia
if account: if account:
cdict['Account'] = account cdict['Account'] = account
# join dict of vairables together in a string in the form of 'key=val|key=val' # join dict of vairables together in a string in the form of 'key=val|key=val'

216
docs/Makefile 100644
View File

@ -0,0 +1,216 @@
# Makefile for Sphinx documentation
#
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = ../
# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
.PHONY: help
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files"
@echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " qthelp to make HTML files and a qthelp project"
@echo " applehelp to make an Apple Help Book"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
@echo " text to make text files"
@echo " man to make manual pages"
@echo " texinfo to make Texinfo files"
@echo " info to make Texinfo files and run them through makeinfo"
@echo " gettext to make PO message catalogs"
@echo " changes to make an overview of all changed/added/deprecated items"
@echo " xml to make Docutils-native XML files"
@echo " pseudoxml to make pseudoxml-XML files for display purposes"
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
@echo " coverage to run coverage check of the documentation (if enabled)"
.PHONY: clean
clean:
rm -rf $(BUILDDIR)/*
.PHONY: html
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
.PHONY: dirhtml
dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
.PHONY: singlehtml
singlehtml:
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
.PHONY: pickle
pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
.PHONY: json
json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
.PHONY: htmlhelp
htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."
.PHONY: qthelp
qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pyst2.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pyst2.qhc"
.PHONY: applehelp
applehelp:
$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
@echo
@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
@echo "N.B. You won't be able to view it unless you put it in" \
"~/Library/Documentation/Help or install it in your application" \
"bundle."
.PHONY: devhelp
devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/pyst2"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pyst2"
@echo "# devhelp"
.PHONY: epub
epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
.PHONY: latex
latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
.PHONY: latexpdf
latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
.PHONY: latexpdfja
latexpdfja:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
.PHONY: text
text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."
.PHONY: man
man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
.PHONY: texinfo
texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."
.PHONY: info
info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
make -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
.PHONY: gettext
gettext:
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
@echo
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
.PHONY: changes
changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."
.PHONY: linkcheck
linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
.PHONY: doctest
doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
.PHONY: coverage
coverage:
$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
@echo "Testing of coverage in the sources finished, look at the " \
"results in $(BUILDDIR)/coverage/python.txt."
.PHONY: xml
xml:
$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
@echo
@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
.PHONY: pseudoxml
pseudoxml:
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
@echo
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

View File

@ -0,0 +1,6 @@
AGI
=========================
.. automodule:: asterisk.agi
:members:

View File

@ -0,0 +1,6 @@
AGITB
=========================
.. automodule:: asterisk.agitb
:members:

View File

@ -0,0 +1,5 @@
Changes
*******
.. include:: ../../CHANGELOG

294
docs/source/conf.py 100644
View File

@ -0,0 +1,294 @@
# -*- coding: utf-8 -*-
#
# pyst2 documentation build configuration file, created by
# sphinx-quickstart on Mon Mar 7 10:41:33 2016.
#
# This file is execfile()d with the current directory set to its
# containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
#
# All configuration values have a default; values that are commented out
# serve to show the default.
import sys
import os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('../../'))
# -- General configuration ------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',
]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
# source_suffix = ['.rst', '.md']
source_suffix = '.rst'
# The encoding of source files.
#source_encoding = 'utf-8-sig'
# The master toctree document.
master_doc = 'index'
# General information about the project.
project = u'pyst2'
copyright = u'2016, Randall Degges'
author = u'Randall Degges'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = u'0.4.9'
# The full version, including alpha/beta/rc tags.
release = u'0.4.9'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = []
# The reST default role (used for this markup: `text`) to use for all
# documents.
#default_role = None
# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True
# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True
# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
# If true, keep warnings as "system message" paragraphs in the built documents.
#keep_warnings = False
# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = True
# -- Options for HTML output ----------------------------------------------
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'alabaster'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = None
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = None
# The name of an image file (relative to this directory) to use as a favicon of
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
#html_extra_path = []
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True
# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}
# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}
# If false, no module index is generated.
#html_domain_indices = True
# If false, no index is generated.
#html_use_index = True
# If true, the index is split into individual pages for each letter.
#html_split_index = False
# If true, links to the reST sources are added to the pages.
#html_show_sourcelink = True
# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
#html_show_sphinx = True
# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
#html_show_copyright = True
# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''
# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None
# Language to be used for generating the HTML full-text search index.
# Sphinx supports the following languages:
# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
#html_search_language = 'en'
# A dictionary with options for the search language support, empty by default.
# Now only 'ja' uses this config value
#html_search_options = {'type': 'default'}
# The name of a javascript file (relative to the configuration directory) that
# implements a search results scorer. If empty, the default will be used.
#html_search_scorer = 'scorer.js'
# Output file base name for HTML help builder.
htmlhelp_basename = 'pyst2doc'
# -- Options for LaTeX output ---------------------------------------------
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
# Additional stuff for the LaTeX preamble.
#'preamble': '',
# Latex figure (float) alignment
#'figure_align': 'htbp',
}
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'pyst2.tex', u'pyst2 Documentation',
u'Randall Degges', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
#latex_use_parts = False
# If true, show page references after internal links.
#latex_show_pagerefs = False
# If true, show URL addresses after external links.
#latex_show_urls = False
# Documents to append as an appendix to all manuals.
#latex_appendices = []
# If false, no module index is generated.
#latex_domain_indices = True
# -- Options for manual page output ---------------------------------------
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'pyst2', u'pyst2 Documentation',
[author], 1)
]
# If true, show URL addresses after external links.
#man_show_urls = False
# -- Options for Texinfo output -------------------------------------------
# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'pyst2', u'pyst2 Documentation',
author, 'pyst2', 'One line description of project.',
'Miscellaneous'),
]
# Documents to append as an appendix to all manuals.
#texinfo_appendices = []
# If false, no module index is generated.
#texinfo_domain_indices = True
# How to display URL addresses: 'footnote', 'no', or 'inline'.
#texinfo_show_urls = 'footnote'
# If true, do not generate a @detailmenu in the "Top" node's menu.
#texinfo_no_detailmenu = False
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}

View File

@ -0,0 +1,6 @@
Config
=========================
.. automodule:: asterisk.config
:members:

View File

@ -0,0 +1,6 @@
fastAGI
=========================
.. automodule:: asterisk.fastagi
:members:

View File

@ -0,0 +1,29 @@
.. pyst2 documentation master file, created by
sphinx-quickstart on Mon Mar 7 10:41:33 2016.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Welcome to pyst2's documentation!
=================================
Contents:
.. toctree::
:maxdepth: 2
readme
agi
agitb
config
fastagi
manager
changes
Indices and tables
==================
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`

View File

@ -0,0 +1,6 @@
Manager
=========================
.. automodule:: asterisk.manager
:members:

View File

@ -0,0 +1 @@
.. include:: ../../README.rst

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

0
setup.py 100755 → 100644
View File